code changes
Merge branch 'master' of https://github.com/sarvesh-tripathi/Jeeyoh

Conflicts:
	common/src/main/java/com/jeeyoh/model/search/MainModel.java
	persistence/src/main/java/com/jeeyoh/persistence/DealsDAO.java
	persistence/src/main/java/com/jeeyoh/persistence/IDealsDAO.java
	persistence/src/main/java/com/jeeyoh/persistence/IUserDAO.java
	persistence/src/main/java/com/jeeyoh/persistence/UserDAO.java
	persistence/src/main/java/com/jeeyoh/persistence/dao/groupon/GDealsDAO.java
	persistence/src/main/resources/config/hibernate.cfg.xml
	service/src/main/java/com/jeeyoh/service/groupon/GrouponFilterEngineService.java
	service/src/main/java/com/jeeyoh/service/groupon/GrouponService.java
	service/src/main/java/com/jeeyoh/service/jobs/DealSearch.java