small tweaks to network UI around localization and regression issue with back-end change, disabled VLAN link for time being.
removing network_controller.rb as all code is migrated to networks_controller.rb to comply with proper rails plurality convention.
removing uneeded network views.
updated scaffold controllers to reflect mew engines class heirarchy
Refactored scaffold controllers to fit new modes scheme after enginization.
set permissions
fix attrib issue that was breaking tests and strength test
Merge pull request #126 from cloudedge/pull-req-master-c0d9a908fdcf7a23f9302ab74173401a4f2e679b

Role HasNode via AttribInstance (death to NodeRole) [2/2]
Ported get_conduits call to Crowbar 2.0.
Merge pull request #128 from cdearborn/pull-req-master-ef21c00c27172119b9f4183fa7e9ccb41a664352

Implementing get_conduits [1/1]
Removing dependency on ServiceObject
Merge pull request #129 from cdearborn/pull-req-master-76c2cf77640f14a4fcc90803246eb5148e3beead

 [2/2]
Fixed file permissions that were incorrectly set by editing files remotely with Samba.
Merge pull request #130 from cdearborn/pull-req-master-275d3918c5a6165342f69511f895272ced7f55ba

Fixing file permissions [1/1]
Merge pull request #131 from dpaterson/pull-req-master-c6d6045f184c6c5813709b50e763e43b8b9604cf

Minor localization changes and deletion of no longer used controller [1/1]
Add barclamp configuration data for catalog function
Included in this commit are the following changes:
- Change designator to path in Bus object
- Added InterfaceSelector object to allow individual intefaces to be accurately selected
- Complete interface selector portion of conduit calculation
Merge pull request #135 from cdearborn/pull-req-master-9cddd384d83cfe975039c0ae73f1d3bd4609a382

Network interface selectors [1/1]
Updated the new network json for the new InterfaceSelector object.
Merge pull request #134 from waynepallen/pull-req-master-0d98bdb0444c68de93b59e8c9eb087a089b6ddaf

Merged by devtool for VictorLowther