Pulled $userEvent out of 'if' branches
Added a $userEvent back, since $user may be updated
Merge branch 'master' of git://github.com/Warbo/LdapBundle into Warbo-master

Conflicts:
	Provider/LdapAuthenticationProvider.php
Exception throw