dev
Merge branch 'master' of github.com:webdoc/urturn-sandbox

Conflicts:
	public/javascripts/post-editor-controller.js