UPDATE
Merge branch 'master' of https://github.com/superleo-cn/pos-android.git

Conflicts:
	src/com/android/common/MyApp.java
MAINACTIVITY