Split out locales
Merge pull request #20 from galthaus/pull-req-release-rails3anddb-master-7d532a7911

More locale and nav changes [6/18]
layout 2 and doc stubs
make sure changes are retained
Merge pull request #21 from cloudedge/pull-req-release-rails3anddb-master-721bbfc872

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

migration pull requests [9/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-3f8d241143

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

Tweak Daves fix for object initialization and fix some linux file format issues [9/29]
correct ordering issue now that we check prereqs and membership
Merge pull request #27 from cloudedge/pull-req-release-rails3anddb-master-38259ad533

Add barclamp requires and membership [2/11]
Remove unneeded code from the barclamp controllers
Move allow_multiple_proposals to config.yml
Merge pull request #28 from galthaus/pull-req-release-rails3anddb-master-11b2420140

More updates puma support controller cleanup [8/27]
Convert routines over to new database methods
Normalize the hash storage pass to include the barclamp name
Merge pull request #29 from galthaus/pull-req-release-rails3anddb-master-d0dd6d5fcd

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

Merge rails3anddb into development [20/29]