apply usertype validation
Merge branch 'master' of https://github.com/stevengc777/creditTool

Conflicts:
	app/partials/addworkshops.html
update templates information