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

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

Move the crowbar.yml layout to v2 [6/27]
Add migration for importing the barclamp
Merge pull request #16 from galthaus/pull-req-release-rails3anddb-master-9110065d92

migration pull requests [6/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 #17 from dpaterson/pull-req-release-rails3anddb-master-92b3b5d11e

re-factor out intialize method in controllers [4/22]
Fix barclamp initialization and unix file format issues
Merge pull request #18 from galthaus/pull-req-release-rails3anddb-master-38d399e6f0

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

More updates puma support controller cleanup [5/27]
Convert routines over to new database methods
Add ipmi-discover to the element order
Merge pull request #20 from galthaus/pull-req-release-rails3anddb-master-a32798483e

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

Merge rails3anddb into development [7/29]
move docs to right places
Merge pull request #24 from cloudedge/pull-req-master-89f8ea624e

Fix documentation references based on new layout [8/24]