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

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

Move the crowbar.yml layout to v2 [7/27]
Add migration for importing the barclamp
Merge pull request #20 from galthaus/pull-req-release-rails3anddb-master-1a9958bb7c

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

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

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

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

Switch over to new objects compute nodes almost work rename needs some help [7/29]
Merge branch 'master' into release/rails3anddb/master
Merge pull request #25 from galthaus/pull-req-release-rails3anddb-master-e641c1ef9f

Merge development into rails3anddb [2/12]
Merge pull request #26 from galthaus/pull-req-master-af6adbab4a

Merge rails3anddb into development [8/29]
move docs to right places
Merge pull request #27 from cloudedge/pull-req-master-fd7dec11bc

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