changes in statistics
Merge branch 'master' of https://github.com/JulianaRed/happy_hours

Conflicts:
	app/views/statistics/todayReport.scala.html
Merge branch 'master' of https://github.com/JulianaRed/happy_hours

Conflicts:
	app/views/statistics/todayReport.scala.html
lastlogincalculate
lastlogincalculate