a
Merge branch 'dev' of https://github.com/openjavascript/jchart into dev