Merge pull request #2 from VictorLowther/pull-req-release-essex-hack-master-07bb5741be

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

Merge essex-hack back into development. [1/26]
Split out en locale
Merge pull request #4 from galthaus/pull-req-release-rails3anddb-master-d7861b6612

More locale and nav changes [14/18]
Add migration for importing the barclamp
Merge pull request #5 from galthaus/pull-req-release-rails3anddb-master-7b12adaba9

migration pull requests [24/29]
Fix barclamp initialization and unix file format issues
Merge pull request #6 from galthaus/pull-req-release-rails3anddb-master-730e17dd5a

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

More updates puma support controller cleanup [22/27]
Convert routines over to new database methods
Merge pull request #8 from galthaus/pull-req-release-rails3anddb-master-87173744f0

Switch over to new objects compute nodes almost work rename needs some help [24/29]
Merge pull request #9 from galthaus/pull-req-master-5d86badaf7

Merge rails3anddb into development [2/29]
Change create_proposal to pass name through
Merge pull request #10 from galthaus/pull-req-master-e6102275bad5d9580a39bc697d78ada8c287fc79

Unit tests for more components [3/17]
Add os_support stanza to crowbar.yml
Merge pull request #11 from VictorLowther/pull-req-master-18a9548803fe8236bd2918dcca092fdf4ffa73be

Merged by devtool for VictorLowther