Umfrage funktionen erweitert
Merge remote-tracking branch 'origin/master'
Umfrage verbessert
Conflicts:
	Project/bin/R.txt
	Project/bin/SocialIntelligence.apk
	Project/bin/classes.dex
	Project/bin/classes/de/Psychologie/socialintelligence/R$string.class
	Project/bin/classes/de/Psychologie/socialintelligence/R$style.class
	Project/bin/classes/de/Psychologie/socialintelligence/R$styleable.class
	Project/bin/classes/de/Psychologie/socialintelligence/R$xml.class
	Project/bin/classes/de/Psychologie/socialintelligence/UserSettingActivity$1.class
	Project/bin/classes/de/Psychologie/socialintelligence/UserSettingActivity$2.class
	Project/bin/classes/de/Psychologie/socialintelligence/UserSettingActivity$3.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.class
	Project/bin/classes/de/Psychologie/socialintelligence/UserSettingActivity$7$1.class
	Project/bin/classes/de/Psychologie/socialintelligence/UserSettingActivity$7$2.class
	Project/bin/classes/de/Psychologie/socialintelligence/UserSettingActivity$7$3.class
	Project/bin/classes/de/Psychologie/socialintelligence/UserSettingActivity$7.class
	Project/bin/classes/de/Psychologie/socialintelligence/UserSettingActivity.class
	Project/bin/classes/de/Psychologie/socialintelligence/Week.class
	Project/bin/resources.ap_
	Project/gen/de/Psychologie/socialintelligence/R.java
	README.md
	actionbar/bin/android-actionbar-library.jar