General cleanup.
Merge branch 'master' of github.com:chmullig/AXIAL

Conflicts:
	src/FoursquareUserMarker.java
Still crashing on drawing markers.