reduced repo to dev-core only
Merge branch 'dev-core-temp' into dev-core

Conflicts:
	js-templates/builder.js
	js-templates/spec.js
reduced repo to dev-core only