Prototype progress
Merge branch 'master' of https://github.com/JohnPett/devart-template

Conflicts:
	project_code/prototype_v3/server.js