merge
Merge branch 'master' of https://github.com/wuggi/softwareengineering
merge
Conflicts:
	actionbar/bin/android-actionbar-library.jar
	numpicker/bin/library.jar
Week Wochentage komplette Breite
Week optisch
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$6.class
	Project/bin/classes/de/Psychologie/socialintelligence/AdminSettingsActivity.class
	Project/bin/classes/de/Psychologie/socialintelligence/PopPollActivity.class
	Project/bin/classes/de/Psychologie/socialintelligence/R$id.class
	Project/bin/classes/de/Psychologie/socialintelligence/R$layout.class
	Project/bin/classes/de/Psychologie/socialintelligence/R$menu.class
	Project/bin/classes/de/Psychologie/socialintelligence/R$raw.class
	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/dexedLibs/android-actionbar-library-2b78e5017303295e4122d592321522a9.jar
	Project/bin/dexedLibs/library-57977847935aac0a4128189be1e4f782.jar
	Project/bin/resources.ap_
	actionbar/bin/android-actionbar-library.jar