admin menu fixed
Merge branch 'hotfixes' into develop

Conflicts:
	oc-includes/osclass/classes/AdminMenu.php