Merge pull request #2 from VictorLowther/pull-req-release-essex-hack-master-065ad4c283

Pull changes from development into essex-hack [7/16]
Merge pull request #3 from galthaus/pull-req-master-fce24911d2

Merge essex-hack back into development. [6/26]
Update to use the new netowrk helper routines
Merge pull request #5 from VictorLowther/pull-req-feature-ip-hacking-master-bcad35869a

Rewrite network barclamp to manage interfaces directly. [14/22]
Add nav nad locale split out
Make name unique.
Merge pull request #6 from galthaus/pull-req-release-rails3anddb-master-61dfae862f

More locale and nav changes [10/18]
Add migration for importing the barclamp
Merge pull request #8 from galthaus/pull-req-release-rails3anddb-master-2fa4350e9b

migration pull requests [18/29]
Fix barclamp initialization and unix file format issues
Merge pull request #9 from galthaus/pull-req-release-rails3anddb-master-f25c306f53

Tweak Daves fix for object initialization and fix some linux file format issues [18/29]
Remove unneeded code from the barclamp controllers
Merge pull request #10 from galthaus/pull-req-release-rails3anddb-master-a77618f52b

More updates puma support controller cleanup [16/27]
Convert routines over to new database methods
Merge pull request #11 from galthaus/pull-req-release-rails3anddb-master-00324a581e

Switch over to new objects compute nodes almost work rename needs some help [18/29]
Merge pull request #12 from galthaus/pull-req-master-e9a8e3dc0a

Merge rails3anddb into development [6/29]
add doc stubs
Merge pull request #13 from cloudedge/pull-req-master-a1aafbff61

Fix documentation references based on new layout [6/24]
Change create_proposal to pass name through
Merge pull request #14 from galthaus/pull-req-master-e6102275bad5d9580a39bc697d78ada8c287fc79

Unit tests for more components [6/17]