for julain
Merge branch 'dev' of https://github.com/amulius/group-project-base into student_frontend_jeff
preparing for merging with Jeff's branch
Merge branch 'student_frontend_jeff' of github.com:amulius/group-project-base into login-julian

Conflicts:
	slides/forms.py
	slides/templates/base.html
preparing for jeff to merge my changes into his branch