More
Merge branch 'master' of https://github.com/anishantony123/MH.git

Conflicts:
	src/com/mh/dao/UserDAO.java
Merge branch 'master' of https://github.com/anishantony123/MH.git