save zip when adding/editing a user + input text form in User.Form.class.php
fix #692
save zip when adding/editing a user + input text form in User.Form.class.php
XSS vulnerability on search.php fixed
Merge branch 'hotfixes' into develop
Merge branch 'develop' of github.com:osclass/Osclass into develop
more XSS fixes
Merge branch 'hotfixes' into develop
small improvement in backup process, previous backup will not be included if using ZipArchive (not possible with pclzip)
Merge branch 'backup' into develop
improved osc_csrf_check, added redirects if can be redirected and if ajax return json with error msg
Merge branch 'csrf-redirection' into develop

Conflicts:
	oc-includes/osclass/helpers/hSecurity.php
removed extra code
issue #693 .htaccess file is not overwrite if it already exists, similar code to delete it when it has been modified outside Osclass
Merge branch '693' into develop
Merge branch 'develop' of github.com:osclass/Osclass into develop
issue #680 , now we check if email or IP is banned before a contact email (on item page and contact page)
Merge branch '680' into develop
issue #375 items could be ordered by expiration date on admin now, on front end is also possible but I decided to not include it by default
Merge branch '375' into develop