Minor updates to OpenStack Users Guide
Merge pull request #6 from cdearborn/pull-req-release-fred-master-afc4042828

Minor documentation updates [1/6]
Fix YAML syntax error
Merge pull request #25 from VictorLowther/pull-req-feature-grizzly-master-ffc3762d231760e1644ae1583d71b1790716c46f

https://github.com/crowbar/barclamp-openstack/pull/25

Merged by devtool for aabes
Make Fred build ruby 1.9 compatible
Merge branch 'feature/grizzly/master' into release/pebbles/master
Defect DE1205: Nova Dashboard shown in incorrect order and instructions incorrect, we do not need to wait for one to complete before applying next proposal.
Merge pull request #26 from dpaterson/pull-req-release-pebbles-master-05c5d44bfe626ba1a1907813cc320fcb9d7ae7e9

Defect DE1205: Nova Dashboard shown in incorrect order and instructions incorrect, we do not need to wait for one to complete before applying next proposal. [1/2]
Replace github.com/dellcloudedge mentions with github.com/crowbar
Merge pull request #27 from vuntz/replace-dellcloudedge

Replace github.com/dellcloudedge mentions with github.com/crowbar
updated docs for Grizzly
Doc updates for Grizzly and Updates to crowbar open stack barclamps guide. Fixed typos. Added old text for order of barclamps creation. Initial UI text change for transition from quantum to neutron.
Merge pull request #33 from dpaterson/pull-req-release-roxy-master-f340d6ff13e28c21c3ee773bc70387fd5b928448

https://github.com/crowbar/barclamp-openstack/pull/33

Merged by devtool for ArkadyKanevsky
Removing unneeded Quantum mention
Fixing hint
Merge pull request #35 from arkadykanevsky/pull-req-release-roxy-master-7f31903703a0499456aee945ae1a7d1b02a70870

Remove mention of Quantum (for summit demo) [1/1]
Merge branch 'release/hydrogen/master'

Conflicts:
	crowbar.yml
	crowbar_framework/public/openstack_users_guide.pdf
Engine-ized barclamp openstack
Fix layout version
Moving crowbar.yml to CB2