Merge pull request #5 from MirantisDellCrowbar/bug/singlenode/pebbles/master

Fix Quantum multimode selection
Merge pull request #7 from MirantisDellCrowbar/bug/DCB-96/pebbles/master

Bug/dcb 96/pebbles/master
Merge pull request #8 from crowbar/release/pebbles/master

Release/pebbles/master
Clean up whitespace in bc-template-quantum.json.
Oops, need to change up metadata port here as well.
Preliminary support for running in GRE mode in Quantum
Experiment with using GRE by default.
Merge pull request #27 from VictorLowther/pull-req-release-pebbles-master-c9539d81711c2214b06995a82fd0ca64896a1732

Add gre mode support to Quantum. [3/4]
Merge pull request #9 from crowbar/release/pebbles/master

Release/pebbles/master
Fixed issue where quantum custom GUI was not showing up
Quantum proposal add/edit screen updates
Merge pull request #28 from cdearborn/pull-req-release-pebbles-master-f194a94445e58ad6194fafeeadc61dbf3817366a

Fixed issue where custom GUI for quantum proposal is not displayed [1/1]
change mysql depencency to database dependency
Merge pull request #32 from cdearborn/pull-req-release-pebbles-master-64b5af8e6cfed7cb6b8372ddfa4f645dbf4de002

Quantum proposal GUI changes [1/1]
Database barclamp conversion
Merge pull request #34 from cdearborn/pull-req-release-pebbles-master-3d8c8d68ea6e36887596e2a7cf30cf7136830f8c

Database barclamp mods [1/1]
Merge branch 'release/pebbles/master' of https://github.com/crowbar/barclamp-quantum into release/pebbles/master
undo dependency on database prior to database barclamp merge
set db dependency to database
Merge pull request #35 from waynepallen/pull-req-release-pebbles-master-b05623bb4be0463dabf80598314488af022d36d6

Configure cinder and quantum to work with new database barclamp [2/2]