changed user_login to handle emails correctly
Merge branch 'ionic' of https://github.com/ifiske/iFiske into ionic