test
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Project/bin/classes/de/Psychologie/socialintelligence/R$string.class
	Project/res/values/strings.xml