Various changes
Merge branch 'master' of https://github.com/Cremesis/SmartCitizenship

Conflicts:
	src/it/cnr/droidpark/ActivityDroidPark.java