Merge branch 'develop' into 'S13788_datetimepicker_selectable_weekdays'

# Conflicts:
#   javascript/src/Main.js
2 jobs for S13788_datetimepicker_selectable_weekdays in 47 seconds (queued for 2 seconds)
Name Stage Failure
snapshot Build

>> 2 errors in 50 files
Warning: Task "jshint:all" failed. Use --force to continue.

Aborted due to warnings.
Makefile:70: recipe for target 'basic' failed
make: *** [basic] Error 3
Cleaning up project directory and file based variables
ERROR: Job failed: exit status 1