changes to UserDAOImpl.java
Merge branch 'master' of https://github.com/qisonfreshers2013/qts

Conflicts:
	src/java/main/com/qts/persistence/dao/UserDAOImpl.java
deleted hibernate-c3p0-4.2.7.Final.jar
hibernate-entitymanager-4.2.7.Final.jar
hibernate-envers-4.2.7.Final.jar
hibernate-osgi-4.2.7.Final.jar
c3p0-0.9.2.1.jar
modified
src\java\main\com\qts\common\Utils.java
src\java\main\com\qts\exception\ExceptionMessages.java
src\java\main\com\qts\handler\UserHandler.java
src\java\main\com\qts\persistence\dao\BaseDAOImpl.java
src\java\main\com\qts\persistence\dao\UserDAO.java
src\java\main\com\qts\persistence\dao\UserDAOImpl.java
src\java\main\com\qts\service\UserService.java
Merge branch 'master' of https://github.com/qisonfreshers2013/qts

Conflicts:
	src/java/main/com/qts/persistence/dao/BaseDAOImpl.java
	src/java/main/com/qts/persistence/dao/UserDAOImpl.java
modified ProjectHandler.java
added methods in UserHandler,UserServices,UserDAOImpl and modifications to searchUser method
Merge branch 'master' of https://github.com/qisonfreshers2013/qts

Conflicts:
	src/java/main/com/qts/common/Utils.java
	src/java/main/com/qts/exception/ExceptionCodes.java
	src/java/main/com/qts/exception/ExceptionMessages.java
	src/java/main/com/qts/handler/ProjectHandler.java
	src/java/main/com/qts/persistence/dao/BaseDAOHibernateImpl.java
	src/java/main/com/qts/persistence/dao/RoleDAOImpl.java
	src/java/main/com/qts/persistence/dao/TimeEntryDAOImpl.java
	src/java/main/com/qts/persistence/dao/UserDAOImpl.java