Merged master, added a temporary background picker fix for this branch

The background picker relies on the CSS being loaded before it can correctly lay out its components.  Unfortunately the CSS plugin does not correctly build the CSS dependencies so they often load after the javascript has executed.  Added an inline style to the background picker until the CSS loader has been fixed.

client/src/ui/widgets/BackgroundPicker.coffee

@@ -49,6 +49,10 @@ define(["vendor/backbone",
 			@$gradientPicker = @$el.find(".gradientPicker")
 			@$gradientPreview = @$el.find(".gradientPreview")
 
+			# TODO: this is a temp hack until we get the CSS plugin 
+			# building correctly.
+			@$gradientPicker.css("width", 250)
+
 			bgOpts = @options.bgOpts or {}
 			bgOpts.change = (points, styles) =>
 				@_updateGradientPreview(styles)