Edit for app-editor
refactor + fix bug for deploy
Merge branch 'feature/dmb-dashboard' into develop