Herp
Merge branch 'master' of https://github.com/martinbang/oblig5

Conflicts:
	AndroidManifest.xml
	src/com/gpstracker/MainActivity.java
	src/com/gpstracker/map/MyItemizedOverlay.java
	src/com/gpstracker/map/TrackerMapActivity.java