Fix unit test because rails routes changed.
Merge pull request #4 from galthaus/pull-req-release-rails3anddb-master-c6a2390e34

Get the admin nodes installed without auth for now [2/6]
move i18n from crowbar.yml into locale file
Merge remote-tracking branch 'origin/release/rails3anddb/master' into release/rails3anddb/master
Merge pull request #5 from cloudedge/pull-req-release-rails3anddb-master-ea9b91a198

Move Nav into a database and adjust imaged locationalization [10/15]
layout 2 and stub the docs
Merge pull request #6 from cloudedge/pull-req-release-rails3anddb-master-9269ec313c

Move the crowbar.yml layout to v2 [21/27]
fix reference issue
correct doc index based on testing
Merge pull request #7 from cloudedge/pull-req-release-rails3anddb-master-c0cd580c2d

Fix the doc system based on a complete index [2/6]
Add migration for importing the barclamp
Merge pull request #8 from galthaus/pull-req-release-rails3anddb-master-2ef6c5fafb

migration pull requests [22/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 #9 from dpaterson/pull-req-release-rails3anddb-master-d8ffc0e492

Re-factor out inialize methods as it caused layout to fail in rails3 [6/11]
Fix barclamp initialization and unix file format issues
Merge pull request #10 from galthaus/pull-req-release-rails3anddb-master-e5c84a8488

Tweak Daves fix for object initialization and fix some linux file format issues [22/29]
fix documentation reference
fix doc ordering
Merge pull request #11 from cloudedge/pull-req-release-rails3anddb-master-154397cc14

Remove catalog.yml references from crowbar framework (will break things) [2/6]
Remove unneeded code from the barclamp controllers