improvements
Merge branch 'hotfixes' into develop

Conflicts:
	oc-admin/ajax/ajax.php
Merge branch 'develop' of github.com:osclass/Osclass into develop

Conflicts:
	oc-admin/ajax/ajax.php