minor fix
Merge branch 'develop' into testing
fixed issue #787, sub sub sub categories
Merge branch 'develop' into testing
Merge branch 'testing' of github.com:osclass/Osclass into testing

Conflicts:
	oc-includes/simpletest/test/osclass/Frontend-search.php