commit
Merge branch 'master' of github.com:ag13tr/jinro

Conflicts:
	helper/SetupClass.php