updated css and javascript for login forms
fixed merge conflicts
Merge pull request #131 from LasseSviland/master

updated css and javascript for login forms