First
Merge branch 'master' of github.com:SulivanDotEu/natagora

Conflicts:
	app/cache/dev/appDevUrlGenerator.php.meta
	app/cache/dev/profiler/index.csv
	app/logs/dev.log
Access control
Merge branch 'master' of github.com:SulivanDotEu/natagora

Conflicts:
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.php.meta
	app/cache/dev/appDevDebugProjectContainer.xml
	app/cache/dev/appDevDebugProjectContainerCompiler.log
	app/cache/dev/appDevUrlGenerator.php
	app/cache/dev/appDevUrlGenerator.php.meta
	app/cache/dev/appDevUrlMatcher.php.meta
	app/cache/dev/classes.php
	app/cache/dev/classes.php.meta
	app/cache/dev/profiler/index.csv
	app/cache/dev/twig/03/68/8a58611309c3d9a58e8e51bc13a1.php
	app/cache/dev/twig/0f/ed/81a4991a8c4977b25e906d22c059.php
	app/cache/dev/twig/58/8c/c64ae5aa8b6f0381f1b44f4cc7c1.php
	app/cache/dev/twig/66/7f/6d92b1b4c1d2bd51d325dcb7c988.php
	app/cache/dev/twig/6c/98/617c0d400ab71b253330b3d5246d.php
	app/cache/dev/twig/74/38/c611c8e419b75d4c24a0b64e8dc7.php
	app/cache/dev/twig/80/68/aeae4a4406be0d88415d614b5a68.php
	app/cache/dev/twig/80/f5/769b2e0cd5db500cacf6f0b2909c.php
	app/cache/dev/twig/97/5f/5d752c1a07af5a636a1a0c145867.php
	app/cache/dev/twig/a9/ac/45b1575965125d19c800114ec58b.php
	app/cache/dev/twig/ab/e8/4d7306071fc19c8260216c86f6e5.php
	app/cache/dev/twig/b3/05/e8c96dbafe73a5876c3edfdbf0c6.php
	app/cache/dev/twig/fc/a5/08aa084d626af7aa64504a89a168.php
	app/logs/dev.log
	src/Walva/NatagoraBundle/Controller/EvenementController.php