Giao diện thanh toán
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/POS_Manager.apk
	bin/classes.dex
	bin/classes/com/pj3/pos_manager/Manager$1.class
	bin/classes/com/pj3/pos_manager/Manager.class
	bin/classes/com/pj3/pos_manager/Payment.class
	bin/classes/com/pj3/pos_manager/R$id.class
	bin/classes/com/pj3/pos_manager/R$layout.class
	bin/classes/com/pj3/pos_manager/R$menu.class
	bin/classes/com/pj3/pos_manager/StatisticManager.class
	bin/resources.ap_
	gen/com/pj3/pos_manager/R.java
Update test
Merge branch 'master' of https://github.com/tuanict/POS_Manager