Initial image repaired, show tiny room images near google map
Resolved merge conflicts