Migration from Eclipse to Android Studio
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/technotracks/ch/database/DatabaseAccess.java