Updates

Squashed some bugs related to the template
Merge branch 'master' of https://github.com/mjkern/ReservationSystem

Conflicts:
	maintemplate.html