Merge branch 'master' of https://github.com/theguiro/LotoLuck into theguiro-master

Conflicts:
	js/controllers/controllers.js
	templates/games/20/list.html
	templates/games/20/template.html
	templates/games/21/list.html
	templates/games/21/template.html
	templates/games/4/list.html
	templates/games/4/template.html
	templates/games/catlot.html
Merge branch 'theguiro-master'

Merge pull request