Merge branch 'master' into anna
Fix empty graph Chart.js
Fix graph view for retina
Merge branch 'anna'