working in form charts
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/statistics/chartsReport.scala.html