new template
Merge branch 'master' of github.com:patrov/opennote

Conflicts:
	components/ContentTypeManager.js