new meta data format
fix typo
Merge pull request #19 from cloudedge/pull-req-release-rails3anddb-master-6beeba69ee

Moving dynamic docs to use database [1/7]
move i18n from crowbar.yml into locale file
Merge pull request #20 from cloudedge/pull-req-release-rails3anddb-master-6c260906eb

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

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

migration pull requests [15/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 #24 from dpaterson/pull-req-release-rails3anddb-master-34d64a53e1

re-factor out intialize method in controllers [11/22]
Fix barclamp initialization and unix file format issues
Merge pull request #25 from galthaus/pull-req-release-rails3anddb-master-0b5f5251a7

Tweak Daves fix for object initialization and fix some linux file format issues [15/29]
Remove unneeded code from the barclamp controllers
Merge pull request #26 from galthaus/pull-req-release-rails3anddb-master-2f1b2f399f

More updates puma support controller cleanup [14/27]
Convert routines over to new database methods
Merge pull request #27 from galthaus/pull-req-release-rails3anddb-master-86d8877603

Switch over to new objects compute nodes almost work rename needs some help [15/29]
fix doc hierarchy
Merge pull request #28 from cloudedge/pull-req-release-rails3anddb-master-288175f7a6

Updates to Unit tests and docs [1/7]
Merge pull request #29 from galthaus/pull-req-master-664a176dad

Merge rails3anddb into development [17/29]