preparing to merge local with dev
Merge branch 'dev' of github.com:amulius/group-project-base into login-julian
updated action modal so user's name links to edit account page
Merge pull request #28 from amulius/login-julian

Login julian
Merge branch 'dev' of github.com:amulius/group-project-base