issue #997
Merge pull request #1033 from conejoninja/hotfixes

issue #987
Merge pull request #1037 from conejoninja/997

issue #997
minor fix
fixed #1034, search + rewrite issue
improvements
Merge branch 'issue-1034' into develop

Conflicts:
	oc-includes/osclass/helpers/hSearch.php
Merge remote-tracking branch 'upstream/develop' into develop