#199 removed escape_javascript to fix text editor
Merge remote-tracking branch 'origin/develop-ja' into develop-ja-text-editor

Conflicts:
	app/views/chairs/_chair.html.erb