first commit to login branch
merge commit
preparing for second merge
working on forms
fixed local settings template
Merge pull request #7 from amulius/login-julian

Login julian