Week fertig
Week enable
Merge branch 'master' of https://github.com/wuggi/softwareengineering
fix
Conflicts:
	Project/bin/SocialIntelligence.apk
	Project/bin/classes.dex
	Project/bin/classes/de/Psychologie/socialintelligence/MainActivity$1.class
	Project/bin/classes/de/Psychologie/socialintelligence/MainActivity$2.class
	Project/bin/classes/de/Psychologie/socialintelligence/MainActivity.class
	Project/bin/classes/de/Psychologie/socialintelligence/SQLHandler.class
	Project/bin/classes/de/Psychologie/socialintelligence/UserSettingActivity$1.class
	Project/bin/classes/de/Psychologie/socialintelligence/UserSettingActivity.class
	Project/bin/classes/de/Psychologie/socialintelligence/Week$1.class
	Project/bin/classes/de/Psychologie/socialintelligence/Week$2.class
	Project/bin/classes/de/Psychologie/socialintelligence/Week$Day.class
	Project/bin/classes/de/Psychologie/socialintelligence/Week.class
	Project/bin/resources.ap_
	Project/src/de/Psychologie/socialintelligence/MainActivity.java
	Project/src/de/Psychologie/socialintelligence/Week.java