move i18n from crowbar.yml into locale file
Merge pull request #25 from cloudedge/pull-req-release-rails3anddb-master-b242045cc2

Move Nav into a database and adjust imaged locationalization [4/15]
layout 2 and stub the docs
Merge pull request #27 from cloudedge/pull-req-release-rails3anddb-master-3c6ccb6123

Move the crowbar.yml layout to v2 [10/27]
Add migration for importing the barclamp
Merge pull request #30 from galthaus/pull-req-release-rails3anddb-master-74d1200d5f

migration pull requests [10/29]
Fixed problem with layout rendering due to initialize method not calling super.  Re-factored to use before_filter method to load @service_object and deleted initialize method.
Merge pull request #31 from dpaterson/pull-req-release-rails3anddb-master-8049582d5c

re-factor out intialize method in controllers [7/22]
Fix barclamp initialization and unix file format issues
Merge pull request #32 from galthaus/pull-req-release-rails3anddb-master-693123aac4

Tweak Daves fix for object initialization and fix some linux file format issues [10/29]
Use barclamp object instead of the catalog.
Use helpers for config hash.
Merge pull request #33 from galthaus/pull-req-release-rails3anddb-master-4dbce482a5

Start using the core objects for saving and retrieving config. More to do, but progress. [1/7]
Remove unneeded code from the barclamp controllers
Merge pull request #34 from galthaus/pull-req-release-rails3anddb-master-56f2baaaab

More updates puma support controller cleanup [9/27]
Convert routines over to new database methods
update name
Fix typo in chash saving
Merge pull request #35 from galthaus/pull-req-release-rails3anddb-master-23b007fc45

Switch over to new objects compute nodes almost work rename needs some help [10/29]
Merge branch 'master' into release/rails3anddb/master