Umfrage Timepicker mit Grenzen
TimePicker Aussehen optimiert
Merge remote-tracking branch 'origin/master'
 test
Conflicts:
	Project/bin/SocialIntelligence.apk
	Project/bin/classes.dex
	Project/bin/classes/de/Psychologie/socialintelligence/PopPollActivity$1.class
	Project/bin/classes/de/Psychologie/socialintelligence/PopPollActivity.class
	Project/bin/dexedLibs/android-actionbar-library-909989d89438570f13072722ceeb18b1.jar
	Project/bin/resources.ap_
	Project/src/de/Psychologie/socialintelligence/PopPollActivity.java
	actionbar/bin/android-actionbar-library.jar