StatisticsController updates
StatisticsController updates.
UserRepository conflict merged