Refacto
Refacto
Refacto
Refacto
Refacto
Refacto

Conflicts:

	Controller/BigfootUserController.php
	DataFixtures/ORM/LoadBigfootUserData.php
	Model/User.php
Refacto
Refactoring
Merge branch 'refacto' of git://github.com/c2is/BigfootUserBundle into refacto

Conflicts:
	Controller/RoleController.php
	Controller/UserController.php
	DataFixtures/ORM/LoadUserData.php
	Mailer/UserMailer.php
fix
Merge branch 'refs/heads/1t' into test

Conflicts:
	Resources/views/Security/forgotPassword.html.twig
	Resources/views/Security/login.html.twig
	Resources/views/Security/resetPassword.html.twig