commiting production version with production stuff
first merge conflict resolution
Merge branch 'master' of github.com:olcar/homePoker

Conflicts:
	app/Controller/StatsController.php