Merge pull request #33 from adoulrac/rachid/release1

Rachid/release1
Exception in login controller changed