added correct time ranges into form timefields
fixed calendar events positions
Merge remote-tracking branch 'origin/master'
fixed labels colors
Merge remote-tracking branch 'origin/master'