previous changes
Merge branch 'master3' of github.com:schedup/schedup into master3

Conflicts:
	templates/calendar.html
tab fix
Merge branch 'master3' of github.com:schedup/schedup into master3

Conflicts:
	templates/calendar.html
Merge branch 'master3' of github.com:schedup/schedup into master3
delete calendar.html