move i18n from crowbar.yml into locale file
Merge pull request #8 from cloudedge/pull-req-release-rails3anddb-master-41f2c02b3d

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

Move the crowbar.yml layout to v2 [12/27]
Add migration for importing the barclamp
Merge pull request #11 from galthaus/pull-req-release-rails3anddb-master-759158deb1

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

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

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

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

Switch over to new objects compute nodes almost work rename needs some help [12/29]
Merge pull request #16 from galthaus/pull-req-master-78868e1479

Merge rails3anddb into development [14/29]
move docs to right places
update doc index
Merge pull request #17 from cloudedge/pull-req-master-1f18dfb920

Fix documentation references based on new layout [14/24]