change building marker icon
Merge branch 'master' of https://github.com/4020group5/project

Conflicts:
	src/hci2/group5/project/map/GoogleMapManager.java
	src/hci2/group5/project/map/marker/MarkerFactory.java