Move stylesheets to assets for rails3
Merge pull request #35 from galthaus/pull-req-release-rails3anddb-master-8d717d5f91

rails3 initial hacks [2/6]
Fix html_safe pieces
Merge pull request #36 from galthaus/pull-req-release-rails3anddb-master-539ebc14d1

Update Rails3 [2/6]
Move sass file around
Merge pull request #37 from galthaus/pull-req-release-rails3anddb-master-2ea7591acd

More updates to the sass fix.  First one wasn't complete enough. [2/6]
move i18n and nav from crowbar.yml into locale file
Merge pull request #38 from cloudedge/pull-req-release-rails3anddb-master-ea35d68998

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

Move the crowbar.yml layout to v2 [23/27]
Add migration for importing the barclamp
Merge pull request #41 from galthaus/pull-req-release-rails3anddb-master-6d7f854696

migration pull requests [25/29]
Added initial basic models for Crowbar 2.0 networking changes.
Merge remote-tracking branch 'origin/release/rails3anddb/master' into release/rails3anddb/master
Merge pull request #42 from cdearborn/pull-req-release-rails3anddb-master-963fc2f4a7

Initial base models for Crowbar 2.0 networking changes [1/5]
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-ceab1fbe88

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

Tweak Daves fix for object initialization and fix some linux file format issues [25/29]
Fix the config proposal code to touch the correct stuff.