.
Merge branch 'racktables-html5' of https://github.com/acidix/racktables into racktables-html5

Conflicts:
	wwwroot/inc/template.php