Merge branch 'origin/dev'
Merge branch 'origin/dev'
Merge branch 'origin/dev'
Merge branch 'origin/dev'
Merge branch 'origin/dev'
Merge branch 'origin/dev'
Merge branch 'origin/dev'
Merge branch 'origin/dev'
Merge branch 'origin/dev'
Merge branch 'origin/dev'
Merge branch 'origin/dev'
Merge branch 'origin/dev'
Merge branch 'origin/dev'
Update gem version
add styles to datetimepicker
Merge remote-tracking branch 'origin/dev' into dev