Flotr graph creation
Merge remote-tracking branch 'rt/master'