refs #530: get edit description dbox wobbling again
refs #530: title and caption editing no longer in edit description dbox.  make save button work as well.
change intro whitespace
Merge branch 'testing' of github.com:oerpub/Aloha-Editor into testing
refs #530: added some sprint-only code to allow figure/img attribute editing on the down low
Merge branch 'feature530' into testing

Conflicts:
	src/plugins/oer/assorted/lib/image.coffee
	src/plugins/oer/assorted/lib/image.js