no message
Merge branch 'master' of https://github.com/fabriph/CERN-THE-Port-hackathon

Conflicts:
	data-collection/AndroidManifest.xml
	data-collection/res/values/strings.xml
	data-collection/src/com/hackathon/casa/MainActivity.java