Merge pull request #1 from masayuki0812/master

Update
Added a 4th param to data label format callback

This gives us more control of data labels. Now we have access to: value,
id, i (index of each datum inside a series), j (index of each series).
Fix conflict