Merge "Fix dev setup guide to include images"