Removal of the '.DS_Store' files.
Preparing for merge.
Merge branch 'master' of https://github.com/migli/CityHunter

Conflicts:
	CityHunterApp/bin/CityHunter.apk
	CityHunterApp/bin/classes/lu/uni/cityhunter/Home$1.class
	CityHunterApp/bin/classes/lu/uni/cityhunter/Home$2.class
	CityHunterApp/bin/classes/lu/uni/cityhunter/Home.class