Committing modified files
Merge branch 'master' of https://github.com/qisonfreshers2013/qts

Conflicts:
	.classpath
	src/java/main/com/qts/common/Utils.java
	src/java/main/com/qts/exception/ExceptionMessages.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/handler/user/AuthenticationHandlerFactory.java
	src/java/main/com/qts/model/UserProject.java
	src/java/main/com/qts/persistence/dao/ActivitiesDAOImpl.java
	src/java/main/com/qts/persistence/dao/BaseDAOHibernateImpl.java
	src/java/main/com/qts/persistence/dao/DAOFactory.java
	src/java/main/com/qts/persistence/dao/RoleDAO.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/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/exception/ExceptionMessages.java
	src/java/main/com/qts/persistence/dao/ActivitiesDAOImpl.java