sag
Merge branch 'master' of https://github.com/AdamTorkelsson/openmap

Conflicts:
	project.properties
	src/com/openmap/grupp1/MainActivity.java
	src/com/openmap/grupp1/MyMap.java
	src/com/openmap/grupp1/NearEventNotifier.java
Changed name of shared preferences