Merge pull request #11 from amulius/teacher-backend

Teacher backend - looks good to jeff
preparing for pull from dev
fixing merge conflicts
updating by branch after merge with dev
working student backend
Merge pull request #12 from amulius/student-backend

working student backend
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
starting tests
Merge pull request #14 from amulius/tests-niki

starting tests
finsh up student modal and added base2 for account page
fix conflict
fixed conflict, changed to bootstrap.css
Merge pull request #15 from amulius/student_frontend_jeff

Student frontend jeff
backup
Merge branch 'dev' of github.com:amulius/group-project-base into teacher-backend