Week Button click
Merge remote-tracking branch 'origin/master'
Week Button click
Conflicts:
	Project/bin/SocialIntelligence.apk
	Project/bin/classes.dex
	Project/bin/classes/de/Psychologie/socialintelligence/MainActivity.class
	Project/bin/classes/de/Psychologie/socialintelligence/Week$1.class
	Project/bin/classes/de/Psychologie/socialintelligence/Week.class
	Project/bin/resources.ap_