修改部分bug
Merge branch 'master' of https://github.com/fywb251/bsl_impc_android

Conflicts:
	cube-android/src/com/foreveross/chameleon/phone/modules/CubeApplication.java