Fixing CORS and Edit/Search
Merge branch 'master' into deleting_procedures

Conflicts:
	src/shell/assets/js/models/shell.store.js