updated composer
updated vendor
added security
added security
updated
updated vendor
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
removed ccdn
updated
Merge remote-tracking branch 'origin/1.0-develop' into 1.0

Conflicts:
	app/AppKernel.php
	app/config/config.yml
	app/config/security.yml
	composer.json
	composer.lock