Merge branch 'develop' into 'master'

conf_apache_dev.md

nginx.conf

package-lock.json

package.json

public/config/config.json

src/assets/icons/fa-icons.js

src/assets/js/map-util.js

src/assets/styles/base.css

src/components/ImportTask.vue

src/components/feature_type/SymbologySelector.vue

src/components/project/project_mapping_basemap.vue

src/main.js

src/service-worker.js

src/services/featureType-api.js

src/services/project-api.js

src/store/modules/feature.js

src/store/modules/feature_type.js

src/views/feature/Feature_detail.vue

src/views/feature/Feature_edit.vue

src/views/feature/Feature_list.vue