Removed separate chosen dir now that it is updated to 1.1.0 in metis
Made changes based on github.com/smalot/bootstrap-datetimepicker/pull/266 to fix issue with modal window reloading
Merge remote-tracking branch 'upstream/master'