Added inventory and config templates
Merge branch 'dev.admin-ui' into dev.admin