Merge branch 'master' into develop
+ [OES-94]  added convertToBytes Helper function
+ updated RELEASE file
[OEM-1] Update Yii to 1.1.14 to fix bug relating to sessions
Merge branch 'develop' of github.com:openeyes/OpenEyes into develop
Merge branch 'master' into develop
Add phpunit binaries to .gitignore.
Don't run composer update during provisioning.
[OE-3330] Remove support for displaying both long and short names of procedures in procedure selection.
[OE-3644] Add additional fields to procedure name search.
[OE-3644] Add aliases field to proc table and include it in search.
Merged from develop and fixed conflicts
[OE-3330] Remove support for displaying both long and short names of procedures in procedure selection. Refs ad2cdbea462dc4846e353297754e3f889afb8e3c
[OE-3330] Remove support for displaying both long and short names of procedures in procedure selection. Refs ad2cdbea462dc4846e353297754e3f889afb8e3c