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

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