Merge remote-tracking branch 'origin/Timothy'

Conflicts:
	admin/routes.py
	admin/templates/layout.html
	admin/templates/semesters.html
	redisDB.py