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

Conflicts:
	AndroidManifest.xml
	project.properties
	src/com/openmap/grupp1/database/LocationMarker.java