Committing current changes to get back into sync with recent activity. Entering merge hell, I suspect.
Merge branch 'master' of https://github.com/bethlakshmi/GBE2

Conflicts:
	expo/scheduler/views.py
Merge? Please merge. Come on git, do the merge.