preparing for new merge
Merge branch 'dev' of github.com:amulius/group-project-base into login-julian
Merge pull request #9 from amulius/login-julian

Login julian