Added bootstrap datetimepicker as a form editor;
Fixed merge conflicts;