Commit to my workspace only.
commit to local
Merge
Merge branch 'master' of https://github.com/superleo-cn/pos-android

Conflicts:
	src/com/android/common/MyApp.java
Commit
Merge
Merge branch 'master' of https://github.com/superleo-cn/pos-android

roid
Add Printer
Commit to local
Commit