ActivityRecordDaoTest updated
Merge branch 'master' of https://github.com/smartly23/CaloryCounter.git
Merge branch 'master' of https://github.com/smartly23/CaloryCounter.git
Merge origin/master
UserStatsDao + UserStatsDto + UserStatsService
Merge origin/master