Timepicker edited to jump with 15min
Merge branch 'origin/master'