Icons hinzugefügt
Merge branch 'master' of https://github.com/wuggi/softwareengineering

Conflicts:
	Project/bin/SocialIntelligence.apk
	Project/bin/classes.dex
	Project/bin/classes/de/Psychologie/socialintelligence/AdminSettingsActivity$2$1.class
	Project/bin/classes/de/Psychologie/socialintelligence/UserSettingActivity$5$1.class
	Project/bin/classes/de/Psychologie/socialintelligence/UserSettingActivity.class
	Project/bin/resources.ap_
	Project/src/de/Psychologie/socialintelligence/UserSettingActivity.java