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

Conflicts:
	src/java/main/com/qts/exception/ExceptionCodes.java
	src/java/main/com/qts/exception/ExceptionMessages.java
	src/java/main/com/qts/handler/RoleHandler.java
	src/java/main/com/qts/handler/UserHandler.java
	src/java/main/com/qts/model/User.java
	src/java/main/com/qts/model/user/AuthTypeJSONResolver.java
	src/java/main/com/qts/model/user/DefaultAuthenticationInput.java
	src/java/main/com/qts/service/RoleService.java
	src/java/main/com/qts/service/UserService.java
	src/java/main/com/qts/service/descriptors/OptionOutputDescriptor.java
changes to user relsated files
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/handler/ReleasesHandler.java
	src/java/main/com/qts/handler/RoleHandler.java
	src/java/main/com/qts/handler/TimeEntryHandler.java
	src/java/main/com/qts/handler/UserProjectHandler.java
	src/java/main/com/qts/handler/UserProjectsRolesHandler.java
	src/java/main/com/qts/model/UserSessionToken.java
	src/java/main/com/qts/persistence/dao/SessionFactoryUtil.java
	src/java/main/com/qts/persistence/dao/UserDAOImpl.java
	src/java/main/com/qts/persistence/dao/UserProjectDAOImpl.java
	src/java/main/com/qts/persistence/dao/UserProjectsRolesDAOImpl.java
	src/java/main/com/qts/service/UserService.java
added ChangePasswordBean.java
Merge branch 'master' of https://github.com/qisonfreshers2013/qts

Conflicts:
	src/java/main/com/qts/exception/ExceptionMessages.java
	src/java/main/com/qts/handler/TimeEntryHandler.java
	src/java/main/com/qts/model/user/AuthTypeJSONResolver.java
	src/java/main/com/qts/model/user/DefaultAuthenticationInput.java
Changes to
src\java\main\com\qts\exception\ExceptionCodes.java
src\java\main\com\qts\exception\ExceptionMessages.java
src\java\main\com\qts\handler\UserHandler.java
src\java\main\com\qts\persistence\dao\SessionFactoryUtil.java
Merge branch 'master' of https://github.com/qisonfreshers2013/qts

Conflicts:
	src/java/main/com/qts/common/Utils.java
	src/java/main/com/qts/exception/ExceptionMessages.java
	src/java/main/com/qts/handler/ProjectHandler.java
	src/java/main/com/qts/handler/ReleasesHandler.java
	src/java/main/com/qts/handler/RoleHandler.java
	src/java/main/com/qts/handler/TimeEntryHandler.java
	src/java/main/com/qts/handler/UserProjectsRolesHandler.java
	src/java/main/com/qts/model/user/DefaultAuthenticationInput.java
	src/java/main/com/qts/persistence/dao/ActivitiesDAOImpl.java
	src/java/main/com/qts/persistence/dao/UserDAOImpl.java
	src/java/main/com/qts/persistence/dao/UserProjectDAOImpl.java
	src/java/main/com/qts/persistence/dao/UserProjectsRolesDAOImpl.java
	src/java/main/com/qts/service/UserService.java
Merge branch 'master' of https://github.com/qisonfreshers2013/qts

Conflicts:
	src/java/main/com/qts/handler/ReleasesHandler.java