Continue timeslots page development 2
Merge pull request #62 from madevr/madevr

Continue timeslots page development 2
Merge pull request #63 from madevr/master

Continue timeslots page development 2