ok pour Tips
ok
ok
Merge OK

Merge branch 'master' of http://github.com/Fireaxe/applicences

Conflicts:
	README.md
	UPGRADE.md
	app/AppKernel.php
	app/Resources/views/front.html.twig
	app/SymfonyRequirements.php
	app/bootstrap.php.cache
	app/check.php
	app/config/config.yml
	app/config/routing.yml
	app/config/security.yml
	composer.json
	composer.phar
	src/appli/AppBundle/Resources/config/routing.yml
	src/appli/AppBundle/Resources/views/Menu/menu.html.twig
	src/appli/UserBundle/Entity/User.php
	web/config.php