全屏触摸
Merge branch 'master' of https://github.com/pkxiuluo/Cube2048

Conflicts:
	bin/Cube2048.apk
	bin/classes.dex
	src/com/example/cube2048/MainActivity.java