Merge branch 'hotfixes' into develop
fixes on hSearch.php osc_search_url
Merge pull request #1064 from garciademarina/issue-2-1034

fixes on hSearch.php osc_search_url
fixed #1058, clearVariables before redirect
Merge pull request #1065 from garciademarina/issue-1058

Issue 1058 fixed
Merge remote-tracking branch 'upstream/develop' into develop
Merge branch 'hotfixes' into develop
added a param to user_form hook
Merge pull request #1070 from conejoninja/userformhook

Userformhook