Merge branch 'edit-inv-page' into upstream_master

Conflicts:
	awx/ui/static/js/controllers/Inventories.js
	awx/ui/static/js/lists/InventoryHosts.js

awx/ui/static/partials/inventory-manage.html

@@ -3,7 +3,7 @@
 
         <ul class="ansible-breadcrumb" id="#breadcrumbs">
             <li><a href="#/inventories">Inventories</a></li>
-            <!-- <li><a href="">{{ inventory.name }}</a></li> -->
+            <!-- <li><a href = "#/inventories/{{inventory.id}}">{{inventory.name}}</a><li> -->
             <li ng-repeat="group_breadcrumb in group_breadcrumbs" ng-class="group_breadcrumb.active_class"><a href="" ng-click="breadcrumbGroupSelect(group_breadcrumb.id)">{{ group_breadcrumb.name }}</a></li>
         </ul>
 
@@ -156,4 +156,4 @@
         <div ng-include="'/static/partials/logviewer.html'"></div>
 
     </div>
-</div>
+</div>