update timeslot
Merge branch 'timeslotmodel' of https://github.com/DSD-BookEasy/BookEasy into timeslotmodel

Conflicts:
	models/Timeslot.php