import and export report formatting changes
Merge branch 'master' into TestCases