Merge branch 'master' into dev

CHANGELOG.md

README.md

ckanext/odsh/assets/.gitignore

ckanext/odsh/assets/autocomplete.css

ckanext/odsh/assets/autocomplete.js

ckanext/odsh/assets/bootstrap-datepicker.js

ckanext/odsh/assets/bootstrap-multiselect.css

ckanext/odsh/assets/bootstrap-multiselect.js

ckanext/odsh/assets/common_map.js

ckanext/odsh/assets/dataset_map.css

ckanext/odsh/assets/datepicker.css

ckanext/odsh/assets/img/pencil.png

ckanext/odsh/assets/leaflet.css

ckanext/odsh/assets/leaflet.draw.css

ckanext/odsh/assets/moment.js

ckanext/odsh/assets/odsh.css

ckanext/odsh/assets/odsh.js

ckanext/odsh/assets/odsh_dataset_map.js

ckanext/odsh/assets/odsh_datepicker.js

ckanext/odsh/assets/odsh_form.js