Merge pull request #1 from anitsirc/editor-file-insertion

Editor file insertion
Conflicts:
	app/assets/javascripts/comfortable_mexican_sofa/application.js.coffee