Merge branch 'Duy'

Conflicts:
	HipperEnterprise/src/java/Controllers/IndexController.java
	HipperEnterprise/web/WEB-INF/web.xml