Lockscreen
Merge branch 'master' of https://github.com/wuggi/softwareengineering

Conflicts:
	Project/bin/SocialIntelligence.apk
	Project/bin/classes.dex
	Project/bin/classes/de/Psychologie/socialintelligence/Alarm.class
	Project/bin/classes/de/Psychologie/socialintelligence/PopPollActivity$1.class
	Project/bin/classes/de/Psychologie/socialintelligence/PopPollActivity$2.class
	Project/bin/classes/de/Psychologie/socialintelligence/PopPollActivity$3.class
	Project/bin/classes/de/Psychologie/socialintelligence/PopPollActivity$4.class
	Project/bin/classes/de/Psychologie/socialintelligence/PopPollActivity$5.class
	Project/bin/classes/de/Psychologie/socialintelligence/PopPollActivity$6$1.class
	Project/bin/classes/de/Psychologie/socialintelligence/PopPollActivity$6$2.class
	Project/bin/classes/de/Psychologie/socialintelligence/PopPollActivity$6.class
	Project/bin/classes/de/Psychologie/socialintelligence/PopPollActivity.class
	Project/bin/classes/de/Psychologie/socialintelligence/SQLHandler.class
	Project/bin/classes/de/Psychologie/socialintelligence/Week.class
	Project/bin/resources.ap_
	actionbar/bin/android-actionbar-library.jar