Fix smoketests
Merge pull request #13 from ninja-cat/release/fred/master

Fix smoketests
Move out locales and add nav to db.
Make name unique
Merge pull request #16 from galthaus/pull-req-release-rails3anddb-master-e591f324b7

More locale and nav changes [2/18]
layout 2 and doc stubs
Merge pull request #17 from cloudedge/pull-req-release-rails3anddb-master-5698128a72

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

migration pull requests [2/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.
Fix barclamp initialization and unix file format issues
Merge pull request #21 from galthaus/pull-req-release-rails3anddb-master-fa8f858af7

Tweak Daves fix for object initialization and fix some linux file format issues [2/29]
Rolling back
Merge branch 'release/rails3anddb/master' of https://github.com/dellcloudedge/barclamp-clouderamanager into release/rails3anddb/master

Conflicts:
	crowbar_framework/app/controllers/clouderamanager_controller.rb
Remove unneeded code from the barclamp controllers
Merge pull request #22 from galthaus/pull-req-release-rails3anddb-master-7b953f4e31

More updates puma support controller cleanup [1/27]
Merge remote-tracking branch 'origin/release/rails3anddb/master' into release/rails3anddb/master
Merge pull request #23 from dpaterson/pull-req-release-rails3anddb-master-298bbf7734

Fixed rendering issue in proposal view [1/6]
Convert routines over to new database methods
Merge pull request #24 from galthaus/pull-req-release-rails3anddb-master-f0577cfb61

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