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

Conflicts:
	Project/bin/SocialIntelligence.apk
	Project/bin/resources.ap_
	actionbar/bin/android-actionbar-library.jar
	numpicker/bin/library.jar
Bugfix