export.html fix
Merge branch 'sprint5' of https://github.com/puruckertom/ubertool_src into sprint5

Conflicts:
	templates/export.html