Conflicts:
	component.json
	flot.jquery.json
	jquery.flot.js
	jquery.flot.pie.js
	jquery.flot.resize.js
	lib/jquery.colorhelpers.js
	package.json

Enrich Flot with the ability to add text into markings.

This was accidentally introduced by #1200; we can’t assume that
axis.ticks is an array.

Use $.isArray instead of instanceof Array; Use full name for parameters.

Don't add padding when there's no last tick.

Default lineHeight based on the font size.

Distinguish between the first and innermost axis.

Flot 0.8.0 used the default font size, typically derived from the
placeholder, as the basis for the default lineHeight.  This produced
incorrect results when a font.size was provided explicitly, and it
differed from the placeholder’s CSS size.

Fixed by waiting to default lineHeight until the actual font size has
been resolved.  Fixes #1131.

Flot 0.8 added logic to account for the size of axis tick labels and add
padding around the edges of the plot, to prevent long labels from
sticking out.  But it padded both sides equally, which is incorrect if
the right/top side has no last axis label.

Fixed by allocating padding per-side, and checking whether the last
label would be shown before padding the top or right.  Fixes #1048.

The fix for #1056 caused a regression where grid lines were drawn for
the innermost axes on both sides instead of just the first axis.
Fixed by properly distinguishing the first axis in each direction from
the innermost one on each side.  Fixes #1075.

Added plot.destroy() method, to properly destruct and release memory of plots.

Add .gitattributes file for EOL normalization

Add missing references and minor update on jquery.flot.js.

Revert the change on jquery.flot.js

Revert the change on jquery.flot.js

Add missing references and minor update on jquery.flot.js.

Revert the change on jquery.flot.js

Revert changes on jquery.flot.js.

Revert the changes to the jquery.flot.js that made by Visual Studio 2012.

 Patch for Issue #707 and #778 (0.9-work)

Added ability to resize the plot to a given size.

- Fixes the issue where steps altering user datapoints
- Do not altering user data points for drawing lines with steps 
(even stacked); just consider drawing with steps enables a different 
kind of plotting and clipping on lines and areas; that assuming that 
drawing with steps must always go horizontally and then verticaly 
(like previous inserted datapoints).

CSP compatibility (flot core)

Move the rowBuffer definition closer to it's usage within the method

:not(selector , selector) isn't actually a valid CSS selector

Bower.json - Ignore rule edition

Fix a serious oversight that occurred when merging pull request #919 into 0.9-work for this pull request

jQuery's Sizzle is the only thing that this actually works in so jQuery will fail when it passes this directly to querySelectorAll()

* Removed self-closing tags
* Move the the nested divs into variables
* Expand the object literals for easier reading

Add Ruby examples