Added Open Street Map
Merge branch 'master' of https://github.com/fabriph/CERN-THE-Port-hackathon

Conflicts:
	data-collection/AndroidManifest.xml
Merge branch 'master' into styles