added timeslot layout and texts
solved merge conflicts
Merge branch 'master' of https://github.com/madevr/phase4