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

Conflicts:
	res/layout/activity_main.xml