Conflicts:
	NEWS.md
	component.json
	flot.jquery.json
	jquery.flot.canvas.js
	jquery.flot.fillbetween.js
	jquery.flot.pie.js
	jquery.flot.time.js
	package.json
	src/jquery.flot.js
	src/plugins/jquery.flot.crosshair.js
	src/plugins/jquery.flot.navigate.js
	src/plugins/jquery.flot.resize.js