Adding modeling changes for timetable
Adding initial timetable templates
Merge branch 'master' of github.com:TracyWebTech/xavier

Conflicts:
	xavier/static/css/screen.css
Adding initial edit timetable template
Adding fixes to improve consistency of timetables
Merge branch 'master' of github.com:TracyWebTech/xavier