fix
Merge branch 'master' of https://github.com/mliu95/bootstrap-datetimepicker-rails