merg
Merge remote-tracking branch 'origin/master'

Conflicts:
	ASquare/bin/ASquare.apk
	ASquare/bin/classes.dex
	ASquare/bin/resources.ap_
	ASquare_Test/bin/ASquare_Test.apk
	ASquare_Test/bin/classes.dex
	ASquare_Test/bin/resources.ap_