Merge branch 'unified-frame-edit-view-vue-dcz-sfc' of...

Merge branch 'unified-frame-edit-view-vue-dcz-sfc' of github.com:dareqx/ShellValier-v2 into unified-frame-edit-view-vue-dcz-sfc

 Conflicts:
	entries/static/entries/js/components/UnificationRightPane.js
	frontend/src/components/unification/Unification/Unification.vue