Second Commit
Merge branch 'master' of https://github.com/UK-AS-HIVE/projectmanager

Conflicts:
	.screenshots/screencapture.js
	client/projectmanager.css
	client/projectmanager.html
	client/projectmanager.js
	lib/collections.js
	server/mainServer.js