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

Conflicts:
	src/com/android/singaporeanorderingsystem/LoginActivity.java