SQL Handler fix
Merge branch 'master' of https://github.com/wuggi/softwareengineering
SQL Handler fix
Conflicts:
	Project/bin/SocialIntelligence.apk
	Project/bin/classes.dex