ok
Updated text options
May 12th, new models for image and paragraph have been added. Changed a bit of the text commenting menu.
Merge branch 'tingtest' of github.com:IanHung/html5test into tingtest
Prelim for comments. Need to update imageclass comments and sentence comments.
Merge branch 'tingtest' into Ian

Conflicts:
	sqlite.db
	static/html5test/css/custom.css
	static/html5test/js/custom.js