Merge branch 'master' into csrf-protection

Conflicts:
	calpoly/config.py
	calpoly/core.py
	calpoly/factory.py
	calpoly/frontend/static/js/ieee.js
	requirements.txt