Bug fix conics
Merge branch 'master' of github.com:jsxgraph/jsxgraph

Conflicts:
	src/Conic.js