merge new version of self-maintened jqplot