fixed bugs when running against a database that is missing the procedures referenced by these migrations.
Merge branch 'master' into release/1.5

Conflicts:
	migrations/m131002_114004_elements_for_new_procedures.php
	migrations/m131002_120142_missing_procedure_elements.php
Merge branch 'master' into develop
[OE-3939] don't destroy data in the tables before removing them
bugfix
+ [OEM-85] restore missing fields to view of cataract op notes
[OEM-95] Block down migration until complete
[OEM-95] wrote missing down migration method
Merge branch 'master' of github.com:openeyes/OphTrOperationnote

Conflicts:
	migrations/m131128_125218_remove_old_junk.php
Merge branch 'master' into develop
+ WIP - compatibility with changes to BaseEventTypeController
+ first pass at controller refactor
+ use child elements to manage the procedure elements
+ changes to procedure elements for child behaviour (WIP)
+ css/html layout for procedure elements
+ tweaks to controller
+ fix printing for controller refactor
+ remove the POST data processing from the procedurelist element
+ fix booking event assignment to procedure list element
+ tidying controller
+ use the new means of setting element defaults and defining what elements should be initialised for a booked operation
+ fix for sub element layout displays