Adds erd.pdf to .gitignore
Merge branch 'master' into new_editor_routes
Makes image control in editor active when an image in the editor is selected