hjg
Merge branch 'master' of https://github.com/superchaoran/hackathon.git

Conflicts:
	bin/HackathonContactShare.apk
	bin/classes.dex