comitting files related to search functionality
thanks
Merge branch 'master' of ssh://github.com/ramakanthreddy/Retail

Conflicts:
	src/main/java/com/javahome/app/service/UserService.java
	src/main/java/com/javahome/dao/BaseDao.java
	src/main/java/com/javahome/dao/entity/UserEntity.java
	src/main/java/com/javahome/web/controllers/UserController.java
	src/main/java/com/sample/flow/BaseDao.java
	src/main/java/com/sample/flow/UserDao.java
	src/main/java/com/sample/flow/UserEntity.java
	src/main/java/com/sample/flow/UserService.java
	src/main/webapp/WEB-INF/mvc-servlet.xml
	src/test/resources/app-test.xml
updated
Merge branch 'master' of ssh://github.com/ramakanthreddy/Retail
added
added
Merge branch 'master' of ssh://github.com/ramakanthreddy/Retail
added
sds