unittests model fixes
Merge branch 'develop' into feature/unitest

Conflicts:
	protected/models/CommonOphthalmicDisorder.php
Merge branch 'feature/unitest' of github.com:openeyes/OpenEyes into feature/unitest

Conflicts:
	protected/models/CommonOphthalmicDisorder.php