JW Aufgeraeumt
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$4.class
	Project/bin/classes/de/Psychologie/socialintelligence/AdminSettingsActivity$5.class
	Project/bin/classes/de/Psychologie/socialintelligence/AdminSettingsActivity$6$1.class
	Project/bin/classes/de/Psychologie/socialintelligence/AdminSettingsActivity$6$2.class
	Project/bin/classes/de/Psychologie/socialintelligence/AdminSettingsActivity$6.class
	Project/bin/classes/de/Psychologie/socialintelligence/AdminSettingsActivity$7$1.class
	Project/bin/classes/de/Psychologie/socialintelligence/AdminSettingsActivity$7$2.class
	Project/bin/classes/de/Psychologie/socialintelligence/AdminSettingsActivity$7$3.class
	Project/bin/classes/de/Psychologie/socialintelligence/AdminSettingsActivity$7.class
	Project/bin/classes/de/Psychologie/socialintelligence/AdminSettingsActivity.class
	Project/bin/classes/de/Psychologie/socialintelligence/Alarm.class
	Project/bin/classes/de/Psychologie/socialintelligence/CustomRingtonepreference$SavedState$1.class
	Project/bin/classes/de/Psychologie/socialintelligence/CustomRingtonepreference$SavedState.class
	Project/bin/classes/de/Psychologie/socialintelligence/CustomRingtonepreference.class
	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/UserSettingActivity$4$1.class
	Project/bin/classes/de/Psychologie/socialintelligence/UserSettingActivity$4.class
	Project/bin/classes/de/Psychologie/socialintelligence/UserSettingActivity$5.class
	Project/bin/classes/de/Psychologie/socialintelligence/UserSettingActivity$6$1.class
	Project/bin/classes/de/Psychologie/socialintelligence/UserSettingActivity$6$2.class
	Project/bin/classes/de/Psychologie/socialintelligence/UserSettingActivity$6$3.class
	Project/bin/classes/de/Psychologie/socialintelligence/UserSettingActivity$6.class
	Project/bin/classes/de/Psychologie/socialintelligence/UserSettingActivity$7.class
	Project/bin/classes/de/Psychologie/socialintelligence/UserSettingActivity$8.class
	Project/bin/classes/de/Psychologie/socialintelligence/UserSettingActivity$9$1.class
	Project/bin/classes/de/Psychologie/socialintelligence/UserSettingActivity$9$2.class
	Project/bin/classes/de/Psychologie/socialintelligence/UserSettingActivity$9$3.class
	Project/bin/classes/de/Psychologie/socialintelligence/UserSettingActivity$9.class
	Project/bin/classes/de/Psychologie/socialintelligence/UserSettingActivity.class
	Project/bin/resources.ap_
	actionbar/bin/android-actionbar-library.jar
	numpicker/bin/library.jar