2013-11-17 5:03 更新
Merge branch 'master' of https://github.com/superleo-cn/pos-android.git

Conflicts:
	res/values/strings.xml
	src/com/android/singaporeanorderingsystem/LoginActivity.java