Editor schema and bower changes
Merge branch 'editor-schema' into develop