bug fixed
Merge branch 'issue-csrf-bug' into develop

Conflicts:
	oc-includes/osclass/helpers/hSecurity.php
Merge branch 'develop' into testing