Fixed the mess at the end of proejct-service.js
Merge remote-tracking branch 'kpalway/master'

Conflicts:
	src/frontend/js/project-service.js
[frontend] More changes.