[OE-2924] Allow disableButtons to be called multiple times
[OE-2578] disallow setting a secondary diagnosis that matches an existing episode level diagnosis.
Merge branch 'release/1.3-moorfields' of github.com:openeyes/OpenEyes into release/1.3-moorfields
[OE-2578] allow dupe diagnoses as long as one attribute is different (eg eye/date)
Allow use of data migrations with different folder to default (class name)
[OE-2928] fluorescein angiography should be unbooked
Merge branch 'release/1.3-moorfields' of github.com:openeyes/OpenEyes into release/1.3-moorfields
[OE-2928] don't show unbooked procedures in the procedure selection widget for bookings/opnotes
[OE-2944] added Trabectome procedure
Cache Element Type in model
+ add clearfix function to eventDetail style
[OE-2788] added medications widget to the patient summary.

Conflicts:
	css/style.css
	protected/controllers/PatientController.php
	protected/models/Patient.php
	protected/views/patient/view.php
Merge branch 'release/1.3-moorfields' of github.com:openeyes/OpenEyes into release/1.3-moorfields
[OE-2955] enable specifying which css/js files should be loaded for a given module controller.
[OE-2936] refactored the way js and css files are loaded for event types.
reverted breakage of css
Add URI.js lib for cleaner handling of urls
[OE-2623 fixed crash when saving medication with a route option
[OE-2944] added trabectome proc to common list for glaucoma
[OE-2960] enabled old js methods so the transport page can print (temporary for 1.3)