HH: Tabs fixed (History tabs)
Fixed PDF/HTML Export
Merge branch 'jon' into sprint5

Conflicts:
	templates/export.html