added some more params to filters
Merge pull request #1282 from conejoninja/hotfixes

added some more params to filters
small fix
wrong hook name
fixed issue #1239
some fixes on version update
update version and changelog
Merge pull request #1286 from conejoninja/fixes

Fixes
issue #1239
Merge branch 'hfix' into conejoninja-hfix

Conflicts:
	oc-includes/osclass/model/Field.php
Merge pull request #1289 from conejoninja/conejoninja-hfix

Conejoninja hfix
Merge remote-tracking branch 'upstream/hotfixes' into mergedev

Conflicts:
	oc-includes/osclass/utils.php
Merge pull request #1292 from osclass/mergedev

Mergedev