basic bundle added
basic bundle added
Merge branch 'master' of https://github.com/RootaccezLabs/lancer

Conflicts:
	app/AppKernel.php
	src/RootAccez/UserBundle/Entity/User.php~
conflict fix