fix
Merge branch 'master' of https://github.com/askaza/cash-russia

Conflicts:
	code/css/components.css
	code/css/default.css