i ========
Merge branch '2.x' of https://github.com/superleo-cn/pos-android into 2.x
i =============
Conflicts:
	.classpath