correct dragAndDropTerms width, shadow, margin
minor cow power
fixed widths for dragAndDropGrid and dragAndDropTerms
Set correct width for energyDensity and energyDensityHousehold
set correct width for matching and oil quality
set correct width for simpleCalculator and worldmapSlider
set correct width for zoomMap
Merge branch 'master' into release

Conflicts:
	EnergyDensityHousehold/sass/widget/energyDensityHousehold.scss
	_sass/partials/global/_uiElements.scss
	cowPower/sass/screen.scss
	dragAndDropGrid/sass/widget/dragAndDropGrid.scss
	dragAndDropTerms/sass/widget/dragAndDropTerms.scss
	energyDensity/sass/widget/energyDensity.scss
	matching/sass/widget/matchingTerms.scss
	oilQualityChart/sass/widget/oilQualityChart.scss
	simpleCalculator/sass/widget/simpleCalculator.scss
	worldmapSlider/sass/widget/worldmapSlider.scss
	zoomMap/sass/widget/zoomMap.scss