Editor
Merge remote-tracking branch 'origin/master'

Conflicts:
	Content/styles.css
	app/partials/Editor.html
Editor