[Type] Don't force json object encoding
Merge branch '2.0'

Conflicts:
	Form/Type/CKEditorType.php