created an editing view for content
brought in micha's api changes
Merge remote-tracking branch 'mike/master'

Conflicts:
	static/js/textbookview.js
fixed up some little errors