clean up config
add html purifier config
Upgrade CKEditor to 4.3.3
allow Symfony 2.5
Merge remote-tracking branch 'upstream/master' into extra_config

Conflicts:
	DependencyInjection/Configuration.php