preparing for pull from dev
fixing merge conflicts
updating by branch after merge with dev
preparing for merge with dev
Merge branch 'dev' of github.com:amulius/group-project-base into login-julian
implemented edit account page and tested with db
attempt to implement populated forms
edit account form almost complete only missing image upload field
Merge pull request #13 from amulius/login-julian

Login julian