[OE-2648] refactored correspondence shortcode system
Merge branch 'develop' of github.com:openeyes/OphCiExamination into develop
+ fix for diagnosis code filtering
Merge branch 'develop' into feature/dr-function

Conflicts:
	components/OphCiExamination_API.php