Merged templates

Signed-off-by: Alexander Kastius <alexander.kastius@student.hpi.uni-potsdam.de>
Merge branch 'racktables_template' of https://github.com/acidix/racktables into racktables_template

Conflicts:
	wwwroot/inc/interface.php
	wwwroot/tpl/vanilla/cacti/CactiConfigEditor.tpl.php