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

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

Move the crowbar.yml layout to v2 [3/27]
Add migration for importing the barclamp
Merge pull request #24 from galthaus/pull-req-release-rails3anddb-master-842562d85a

migration pull requests [3/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 #25 from dpaterson/pull-req-release-rails3anddb-master-747d17db49

re-factor out intialize method in controllers [2/22]
Fix barclamp initialization and unix file format issues
Merge pull request #26 from galthaus/pull-req-release-rails3anddb-master-9b6289e884

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

More updates puma support controller cleanup [2/27]
Convert routines over to new database methods
Merge pull request #28 from galthaus/pull-req-release-rails3anddb-master-157288c821

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

Merge rails3anddb into development [18/29]
move doc files to right places
Merge pull request #30 from cloudedge/pull-req-master-404151574c

Fix documentation references based on new layout [18/24]
Don't die horribly if we do not have a domain.
Don't have a default domain.
Merge pull request #32 from VictorLowther/pull-req-master-cb6a76ff6b37bc

Simplify transition functions for crowbar and the provisioner [3/3]