simplified a demo controller
merged branch fabpot/security-simplification (PR #541)

This PR was merged into the master branch.

Discussion
----------

simplified a demo controller

Commits
-------

a55b80f simplified a demo controller
updated VENDORS for 2.3.0-BETA2
updated bundle deps to 2.3
Merge branch 'standard-master'

Conflicts:
	composer.json
	src/Acme/DemoBundle/Controller/SecuredController.php
	web/config.php