Fixed calendar buttons error

I also made other changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	accounts.ser
	reservations.ser