Fix error with overlapping flotr box
Merge branch 'master' of github.com:VizGrimoire/VizGrimoireJS
Merge remote-tracking branch 'upstream/master'