update documentation for barclamp import changes
Merge remote-tracking branch 'origin/release/rails3anddb/master' into release/rails3anddb/master
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.
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 #114 from dpaterson/pull-req-release-rails3anddb-master-76ad4f544a

Re-factor out inialize methods as it caused layout to fail in rails3 [4/11]
Added basic network modeling classes into scaffolding
Merge remote-tracking branch 'origin/release/rails3anddb/master' into release/rails3anddb/master
Merge pull request #115 from cdearborn/pull-req-release-rails3anddb-master-a512bf303b

Enabled scaffolding for base networking models [1/5]
fix doc bug, allow dev flag on menus, add scaffold menus
Merge remote-tracking branch 'origin/release/rails3anddb/master' into release/rails3anddb/master
Merge pull request #116 from cloudedge/pull-req-release-rails3anddb-master-889cc7628b

doc bug fix and nav for scaffolds [1/5]
Fix barclamp initialization and unix file format issues
Merge pull request #117 from galthaus/pull-req-release-rails3anddb-master-483a1bd91e

Tweak Daves fix for object initialization and fix some linux file format issues [20/29]
migration filename fixup; rename clawhammer to cmdb; first cmdb commit; add copyrights
removed already updated files
remove node description
node stuff
node model needs a description, and an order
more robust create cmdbs migration
remove a space, really