New time slot now works
Updates and 'resets'
Hotfix
Fixed merge conflic
Create default schedule is now visable
Hotfix
Hotfix 2
Merge remote-tracking branch 'upstream/master'