refactoring
Merge remote-tracking branch 'origin/master' into ChangeSize
6f037a563b3efc5df84014ee.

Conflicts:
	bin/PuzzleMenuTest.apk
	bin/classes.dex
	bin/resources.ap_
	gen/.gitignore