local commit
Merge branch 'master' of https://github.com/qisonfreshers2013/qts
added service Activities
added service call to activities
Merge branch 'master' of https://github.com/qisonfreshers2013/qts

Conflicts:
	api.html
	index.html
	resources/js/approverSearch.js
	resources/js/defaultTimeSheetPage.js