Merge branch 'development_new' into development_cxs

# Conflicts:
#	src/views/licenseManagement/businessLicense.vue