some updates to maps
Merge branch 'master' of https://github.com/CMPUT301W14T08/GeoChan

Conflicts:
	GeoChan/src/ca/ualberta/cmput301w14t08/geochan/managers/ThreadManager.java
	GeoChan/src/ca/ualberta/cmput301w14t08/geochan/models/CustomMarker.java