merge
Merge branch 'master' of https://github.com/wuggi/softwareengineering
OK
Conflicts:
	Project/bin/SocialIntelligence.apk
	Project/bin/classes.dex
	Project/bin/classes/de/Psychologie/socialintelligence/Alarm.class
	Project/bin/classes/de/Psychologie/socialintelligence/SQLHandler.class
SQL Methoden erweitert