ok
Merge branch 'master' of https://github.com/qisonfreshers2013/qts

Conflicts:
	AddProject.html
	resources/js/AllocateUsersToProject.js
Merge branch 'master' of https://github.com/qisonfreshers2013/qts

Conflicts:
	AddProjectRelease.html
	SearchProjectRelease.html
	approverSearch.html
	resources/css/approverSearch.css
	resources/js/ReleaseResult.js
	resources/js/approverSearch.js
	resources/js/defaultApproverPage.js
	resources/js/defaultTimeSheetPage.js
	resources/js/loader.js
	resources/js/roles.js
	resources/js/timeEntry.js
	timeEntry.html
Added two new methods to project service
Merge branch 'master' of https://github.com/qisonfreshers2013/qts

Conflicts:
	resources/js/roles.js
	src/java/main/com/qts/exception/ExceptionCodes.java
	src/java/main/com/qts/exception/ExceptionMessages.java