removing HTML mock after tests are complete
Merge branch 'master' into gh-pages