+create/edit in HTML template now
+some project's structure changes
Merge branch 'master' of https://github.com/projectstest/project1test

Conflicts:
	nodejs/config/config.js