Merge branch 'master' into stable

Conflicts:
	bower.json
	dist/jsgraph.js
	dist/jsgraph.min.js
	examples/src/legend.js
	examples/src/shape.js
	package.json
	src/series/graph.serie.scatter.js