a
Merge remote-tracking branch 'origin/master'

Conflicts:
	ASquare/bin/ASquare.apk
	ASquare/bin/classes.dex
	ASquare/bin/resources.ap_
	ASquare/gen/com/example/asquare/R.java