gf
Merge branch 'master' of https://github.com/chrislol/A_square.git

Conflicts:
	ASquare/assets/web/manual/gpa.htm
	ASquare/bin/ASquare.apk
	ASquare/bin/classes.dex
	ASquare/bin/resources.ap_
Merge remote-tracking branch 'origin/master'

Conflicts:
	ASquare/bin/ASquare.apk
	ASquare/bin/resources.ap_