Merge branch 'hotfix/1.6.2'
Upgrade to use bootstrap-datetimepicker 2.2.0
Merge branch 'hotfix/1.6.3' into develop