FUCK OFF
Merge branch 'master' of https://github.com/Blechfalke/SkiTrack.git

Conflicts:
	Technopole_MyTracks/AndroidManifest.xml
	Technopole_MyTracks/bin/AndroidManifest.xml
	Technopole_MyTracks/bin/Technopole_MyTracks.apk
	Technopole_MyTracks/bin/classes.dex
	Technopole_MyTracks/bin/resources.ap_
	Technopole_MyTracks/src/ch/technotracks/dbaccess/DatabaseAccessObject.java