_
Merge branch 'master' of https://github.com/qwer-team/lotto-frontend

Conflicts:
	Resources/public/css/jquery-ui-1.8.10.custom.css
_