Fixes
Merge branch 'master' of github.com:aromanovich/hackathon-statistics-66

Conflicts:
	statistics/templates/charts.html