Merge branch 'master' of https://github.com/1oleg1/game2ok

Conflicts:
	admin/parser/jobsua_v.php
Merge branch 'master' of https://github.com/1oleg1/game2ok

Conflicts:
	admin/parser/jobsua_v.php