Add timeslot field to bring pop up window for editing time slots
Time slot edit view
Merge pull request #2 from soap/master

Merge upstream changes