Update locale split out.
Merge pull request #22 from galthaus/pull-req-release-rails3anddb-master-8fa693307f

More locale and nav changes [1/18]
make sure changes are retained
Merge pull request #23 from cloudedge/pull-req-release-rails3anddb-master-ce04c3cc14

Move the crowbar.yml layout to v2 [1/27]
add doc framework
add doc framework
Merge remote-tracking branch 'origin/release/rails3anddb/master' into release/rails3anddb/master
Merge pull request #24 from cloudedge/pull-req-release-rails3anddb-master-b0da3e815d

Make sure db migrate is to production [1/5]
Add migration for importing the barclamp
Fix name issue with _
Merge pull request #27 from galthaus/pull-req-release-rails3anddb-master-757f9ba099

migration pull requests [1/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 #28 from dpaterson/pull-req-release-rails3anddb-master-5050a707fc

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

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

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

Move allow_multiple_proposals to barclamp and clean up controllers [1/28]