Update 16
Merge branch 'master' of https://github.com/SamRyecroft/Client-Services

Conflicts:
	server/app.js
Update 17