merge
Merge branch 'master' of https://github.com/wuggi/softwareengineering
merge?
Conflicts:
	Project/bin/SocialIntelligence.apk
	Project/bin/classes.dex
	Project/bin/dexedLibs/android-actionbar-library-909989d89438570f13072722ceeb18b1.jar
	Project/bin/resources.ap_
	actionbar/bin/android-actionbar-library.jar
	numpicker/bin/library.jar
fix Week - SQLHandler setzen von nextAlarm, klappt aber muss noch mal schick gemacht werden