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

Conflicts:
	Project/bin/SocialIntelligence.apk
	Project/bin/classes.dex
	Project/bin/resources.ap_