Add server side validation
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	js/admin.js
	js/hbs_templates/edit.hbs
Merge remote-tracking branch 'origin/develop' into develop
Work with server-side validation