unit test for search form
Merged with feature branch
Added index information for HTML xmodules
Added index information for Video xmodules
Pushed content into content node and some cleanup after merge