Merge branch 'issue-datepicker' into hotfixes
Fixes #854
Fixes #854
Fixes conflict in sidebar with box-sizing