Counter ended and coming game in GameDAO
merge
add injection controller
injection controller clean method
merge
merge game
Fix Bug on Reporting View
merge
new data in inject data
Merge branch 'rose_branch' of https://github.com/sigl-mepa-2015/mepa into rose_branch
add jointure