add arrangement logic
Merge branch 'master' of github.com:craigmin/testcocos2dx

Conflicts:
	third_party/Lihui2048Api/Lihui2048Api/src/cn/lihui/game/MatrixOperator.java
	third_party/Lihui2048Api/Lihui2048Api/src/cn/lihui/game/object/Matrix.java