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

More locale and nav changes [8/18]
layout 2 and doc stubs
make sure commits are kept
Merge pull request #40 from cloudedge/pull-req-release-rails3anddb-master-9619f74dc0

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

migration pull requests [13/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 #43 from dpaterson/pull-req-release-rails3anddb-master-b668bba802

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

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

Add barclamp requires and membership [3/11]
Remove unneeded code from the barclamp controllers
Make allow_multiple_proposals a config option.
Merge pull request #46 from galthaus/pull-req-release-rails3anddb-master-d55554f9c7

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

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

Merge rails3anddb into development [9/29]