Fixed map bug with long taps..
Merge branch 'master' of https://github.com/fabriph/CERN-THE-Port-hackathon

Conflicts:
	data-collection/res/layout/activity_launcher.xml
	data-collection/src/com/hackathon/casa/LauncherActivity.java