small fix
Merge pull request #1113 from conejoninja/iscustom

small fix
small fix
Merge pull request #1116 from conejoninja/hotfixes

small fix
copied bender into gui
Merge pull request #1117 from conejoninja/hotfixes

copied bender into gui
Version 3.2.2
Merge branch 'hotfixes' into develop

Conflicts:
	oc-includes/osclass/upgrade-funcs.php
Merge pull request #1120 from conejoninja/develop

Develop update