ALL DAT SHIT!!! Call on me. Some weird stuff with map markers. - Joel
Merge branch 'master' of https://github.com/pennja01/NorseSquare

Conflicts:
	Android/src/com/sp/norsesquare/froyo/NorseSquare.java
Merge branch 'master' of https://github.com/pennja01/NorseSquare