Minor fix for 8021q edit form
Merge branch 'racktables_template' into racktables_bootstrap
ported 8021q
minifix for portmap
Merge branch 'racktables_template' into racktables_bootstrap
minifix for portmap
Merge branch 'racktables_template' into racktables_bootstrap

Conflicts:
	wwwroot/tpl/bootstrap/parentmap/RenderObjectParentCompatEditor_PrintNewItem.tpl.php
Ported ParentCompat
fixed portifcompat
Merge branch 'racktables_template' into racktables_bootstrap
fixed parentmap and port mapping