Merge export.html into test.html
Merge pull request #394 from Sannis/merge_test_and_export_html

Merge export.html into test.html