PDF and HTML Report Generation added back
Merge branch 'jon' into sprint14