Kuy
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/ese/beans/BarcodePrintingBean.java
test hai noi na ja