Merge remote-tracking branch 'crowbar/master'
removed :en by mistake addning back in
Additional tweaks after Chris' review
Remove comment
Combined VlanInterface and Vlan models since there doesn't seem to be any need for both at this point.
Merge pull request #167 from cdearborn/pull-req-master-b0cc8e1817534047db36abc1aab3c423723e910a

Squash Vlan and VlanInterface into 1 class [1/1]
Merge pull request #168 from dpaterson/pull-req-master-a372814d37700028e7e78244111846cefc9036b1

Refactored networks controller to fit new v2 pattern [1/1]
cleanup based on getting the right data into the test database
Merge pull request #169 from cloudedge/pull-req-master-4ed3a472668365dfb9125a765ed0332fdad712f5

https://github.com/crowbar/barclamp-network/pull/169

Merged by devtool for VictorLowther