check
Merge branch 'master' of https://github.com/wuggi/softwareengineering
Test
Conflicts:
	Project/bin/classes/de/Psychologie/socialintelligence/SQLHandler.class
	Project/src/de/Psychologie/socialintelligence/SQLHandler.java