GUBuildingMarker class
Merge branch 'dev' of https://github.com/blackdoor/GUmap into dev

Conflicts:
	gen/com/blackdoor/gumap/R.java
GUBuildingMarker class