something is fixed
something is fixed
Merge branch 'master' into gh-pages

Conflicts:
	app/js/controllers/themeEditorCtrl.js
	app/partials/newTemplate.html