admin
Merge branch 'master' of https://github.com/lhtuan/javaProject

Conflicts:
	appliances/src/main/java/service/implement/AccountServiceImpl.java
	appliances/src/main/resources/hibernate.xml