added security
updated settings removed ccdn
Merge branch '1.0-scratchpad' into 1.0-develop

Conflicts:
	app/AppKernel.php
	app/config/config.yml
	app/config/security.yml
	composer.lock
fix merge commit