[OE-5210] groups of common ophthalmic disorders
Merge branch 'feature/glaucoma-2.1' into jira/OE-5210

Conflicts:
	protected/controllers/AdminController.php
	protected/models/CommonOphthalmicDisorder.php
	protected/views/admin/sidebar.php
[OE-5210] Grouping
[OE-5210] Fix sorting
Merge branch 'feature/glaucoma-2.1' into jira/OE-5210