Some fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	admin/views/editor.html