Login/registration
Login/registration
Merge branch 'master' of https://github.com/sarvesh-tripathi/Jeeyoh

Conflicts:
	common/src/main/java/com/jeeyoh/model/user/UserModel.java
	controller/pom.xml
	persistence/src/main/java/com/jeeyoh/persistence/IDealsDAO.java
	persistence/src/main/java/com/jeeyoh/persistence/UserDAO.java
	persistence/src/main/java/com/jeeyoh/persistence/domain/User.java
	persistence/src/main/resources/hbm/User.hbm.xml
	service/src/main/java/com/jeeyoh/service/groupon/GrouponFilterEngineService.java
	service/src/main/java/com/jeeyoh/service/jobs/DealSearch.java
	service/src/main/java/com/jeeyoh/service/userservice/IUserService.java
	service/src/main/java/com/jeeyoh/service/userservice/UserService.java
	service/src/main/java/com/jeeyoh/service/yelp/YelpFilterEngineService.java