。。。
Merge branch 'master' of https://github.com/superleo-cn/pos-android
i .....
Conflicts:
	src/com/android/singaporeanorderingsystem/MainActivity.java