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

Conflicts:
	project.properties