Some changes not included in last night's commit
Commits that apparently failed to take last night
Merge branch 'master' of https://github.com/bethlakshmi/GBE2

Conflicts:
	expo/gbe/views.py