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