test
Merge branch 'master' of https://github.com/wuggi/softwareengineering
test
Conflicts:
	Project/bin/classes/de/Psychologie/socialintelligence/MainActivity.class
	Project/bin/classes/de/Psychologie/socialintelligence/PopPollActivity.class
	Project/bin/classes/de/Psychologie/socialintelligence/R$id.class
	Project/gen/de/Psychologie/socialintelligence/R.java
	Project/res/layout/activity_main.xml