fixes content not updating after the first change
stops reloading editor after first change to aloha
Merge pull request #416 from Connexions/editing-change-fixes

EDITING: change fixes
Merge branch 'editing' into stop-aloha-caching

Conflicts:
	src/scripts/helpers/backbone/views/editable.coffee
Merge pull request #413 from Connexions/stop-aloha-caching

EDITING: Stop aloha caching
workspace listing is incorrect if you view content and then go back to the workspace
Merge pull request #417 from Connexions/editing-workspace-list-reload-wrong-list

EDITING: workspace list reload wrong list
Merge branch 'editing' into editing-image-upload-hack
merged changes from editing