test
Merge branch 'master' of https://github.com/Fufanu/mobApps-OSM.git

Conflicts:
	README.md