Move translations into custom files
Merge pull request #28 from galthaus/pull-req-release-rails3anddb-master-6f3ca0ac87

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

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

migration pull requests [4/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 #33 from dpaterson/pull-req-release-rails3anddb-master-e0fa10770b

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

Tweak Daves fix for object initialization and fix some linux file format issues [4/29]
keystone needs to be after mysql and before rest of OpenStack
keystone needs to be after mysql and before rest of OpenStack
Merge pull request #35 from cloudedge/pull-req-release-rails3anddb-master-0ffed1f5b4

Fix missed ordering [1/4]
Remove unneeded code from the barclamp controllers
Move allow_multiple_proposals to config.yml
Merge pull request #36 from galthaus/pull-req-release-rails3anddb-master-56c199bec1

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

Switch over to new objects compute nodes almost work rename needs some help [4/29]