Merge branch 'master' of https://github.com/UCDAAPIT/daapcamps

Conflicts:
	auth/views.py
	daapcamps/urls.py
	static/templates/base.html
	static/templates/daapcamps/index.html
	static/templates/daapcamps/login.html
	storage.db
git latest