TemplateList
Merge remote-tracking branch 'origin/us40622' into us40622

Conflicts:
	public/css/main.css
	public/js/components/componentTemplateList.js
	public/js/views/viewTest.js