login now works :-)
some minor changes to AccountController
Merge branch 'master' into nadja