update the building clicking
merge the develop
update
update
update
deal with the conflict
update the add building menu
update the building