node group added.  cleanups on barclamp proposal view
start of cmdb
working w/ judd
Merge remote-tracking branch 'origin/release/rails3anddb/master' into release/rails3anddb/master
Merge pull request #124 from cloudedge/pull-req-release-rails3anddb-master-1cb659750e

Minor updates for crowbar catalog, node and cmdb [1/5]
blah
robs changes
basic cmdb models and migrations for review.
add activescaffold for CmdbAttribute
Merge pull request #123 from VictorLowther/pull-req-master-2b8d83755a

Forward-port execute state changes from Fred, and add hetrogenous OS support. [1/7]
O
Merge branch 'release/rails3anddb/master' of http://github.com/dellcloudedge/barclamp-crowbar into release/rails3anddb/master

Conflicts:
	crowbar_framework/app/models/proposal.rb
Merge remote-tracking branch 'origin/master'
Add role element order objects
Add import function to populate them
Add role/proposal old-style processor (temporary)
fix CmdbMap model filename and object name
Fix bug in barclamp import
Rename model file to match style
Fix model names
barclamps should be barclamp
Fix role element order access
Merge pull request #125 from juddmaltin-dell/pull-req-release-rails3anddb-master-f75c694425

fix class name CmdbMaps -> CmdbMap [1/5]
Make the crowbar customer apply routine work with new barclamp object.