related to issue #717
Merge branch 'hotfixes' into develop

Conflicts:
	oc-includes/osclass/UserActions.php
improvements
Merge branch 'hotfixes' into develop