Merge branch 'master' into stable

Conflicts:
	bower.json
	dist/jsgraph.js
	dist/jsgraph.min.js
	examples/src/60-others/legend.js
	examples/src/60-others/shape.js
	examples/src/errorbars.js
	gruntfile.js
	package.json
	src/graph.core.js
	src/series/graph.serie.line.js
	src/series/graph.serie.scatter.js
	src/shapes/graph.shape.js