Default time formats and setup for grid views
Merge branch 'master' of https://github.com/bethlakshmi/GBE2

Conflicts:
	expo/scheduler/views.py