Merge branch 'CK_EDITORINTEGRATION'

Conflicts:
	app/views/layout.blade.php