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

Move Nav into a database and adjust imaged locationalization [6/15]
layout 2 and doc stubs
Merge pull request #58 from cloudedge/pull-req-release-rails3anddb-master-675623b66c

Move the crowbar.yml layout to v2 [14/27]
Add migration for importing the barclamp
Merge pull request #61 from galthaus/pull-req-release-rails3anddb-master-3757b236e9

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

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

Tweak Daves fix for object initialization and fix some linux file format issues [14/29]
change /usr/bin/ruby to /usr/bin/env ruby
Merge pull request #66 from juddmaltin-dell/pull-req-release-rails3anddb-master-2da6fd22bd

change /usr/bin/ruby to /usr/bin/env ruby [1/7]
Remove unneeded code from the barclamp controllers
Merge pull request #67 from galthaus/pull-req-release-rails3anddb-master-0f58b53524

More updates puma support controller cleanup [13/27]
Convert routines over to new database methods
Set state the "right" way
Fix typo in provisioner
Fix lookup node reference.
Normalize the hash storage pass to include the barclamp name
Merge pull request #68 from galthaus/pull-req-release-rails3anddb-master-a33c930fb6

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