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

Conflicts:
	src/com/gpstracker/map/TrackerMapActivity.java