Merge branch 'html_version_of_widget' into development
Add to and clean up widget hooks. simple documentation
Merge branch 'development'