issue #1027 added s_section to update queries
issue #1008 fancybox repeating the first image
small fix on market download temp folder
issue #1027 changed Preference::update to osc_set_preference ;)
getPreference to osc_get_preference change
Merge branch 'hotfixes' into develop
Fixed the colspan on the comments page when there are no comments.
Merge pull request #1044 from conejoninja/1008

Issue #1008 - Prevent click in big image and remove the big one from the fancybox
Merge pull request #1059 from trains58554/develop

Fixed the colspan on the comments page when there are no comments.
Merge pull request #1059 from trains58554/develop

Fixed the colspan on the comments page when there are no comments.
Merge pull request #1040 from conejoninja/1027

issue #1027 added s_section to update queries
Merge pull request #1040 from conejoninja/1027

issue #1027 added s_section to update queries
Conflicts:
	oc-admin/controller/settings/media.php
fixed #1028, if param is numeric call findByPrimaryKey function
Merge branch 'issue-1028' into develop

Conflicts:
	oc-admin/controller/settings/media.php
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