various bug fix
Merge branch 'master' of https://github.com/ustcomp3111/comp3111project

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