Fix installation issue
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Keosu/UserBundle/Controller/SecurityController.php