Ckeditor now saves

Not just you but the world :+1:
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/app/scripts/loadblocks.php