Merge branch 'master' of git@github.com:npthuan293/Voucher.git

Conflicts:
	Voucher/build/web/WEB-INF/classes/voucherShop/Connect.class
	Voucher/build/web/WEB-INF/classes/voucherShop/Event.class
	Voucher/build/web/WEB-INF/classes/voucherShop/Voucher.class
	Voucher/build/web/WEB-INF/lib/commons.io_2.0.1.jar
	Voucher/build/web/index.jsp
	Voucher/build/web/voucher_pages.jsp
	Voucher/nbproject/build-impl.xml~
	Voucher/nbproject/private/private.xml
	Voucher/src/java/voucherShop/Voucher.java
	Voucher/web/index.jsp
	Voucher/web/voucher_pages.jsp