OE-3584 - consolidating to 130913_000000
-created new consolidate migration file and data
-removed old migration files and data
+ Clean up consolidated schema by removing redundant clauses and ensuring everything is UTF-8
+ Remove empty migration data
+ Copy consolidated migration data to features as base for test data
OE-3584 - adding some methods in the OEMigration class to help migrations inserting elements and event types
Modules need this version of OEMigration from this branch to work correctly
OE-3584 - adding insertElementTypes
Merge branch 'jira/3584' of github.com:openeyes/OpenEyes into jira/3584
OE-3584 - fixed insertEventType bug, was not returning the event_type_id correctly
OE-3584 - added more core table insert helper methods
-insertOEElementTypeEye
-insertOEElementTypeAnaesteticTablesHelper
-insertOEGenericDynamicTable
OE-3584 - removed some dynamic inserts and added a delete dynamic method and some more echo when importing
OE-3584 - added logic to override ElementType inserts with custom display_order and default
OE-3584 - added logic to override ElementType inserts with custom required value, also cleaned the code a little
OE-3584 - fixed ElementType inserts default values for parent_element_type_id and required when NULL
OE-3584 - added some comments in the command file to show usage, also included reference to the DevTools for module consolidation generation help
Merge branch 'develop' into jira/3584

Conflicts:
	protected/migrations/data/m130306_105300_add_ethnic_group_to_patient/01_ethnic_group.csv
	protected/migrations/m120302_092216_pas_patient_assignment.php
	protected/migrations/m120613_162100_remove_examination_elements.php
	protected/migrations/m120809_093634_create_a_contact_for_all_users.php
	protected/migrations/m120809_142529_add_limbal_relaxing_incision_to_cataract_common_procedures.php
	protected/migrations/m120813_073133_ucwords_the_site_names.php
	protected/migrations/m120816_085927_remove_nightingale_nursing_home_site.php
	protected/migrations/m120824_074626_site_table_changes_and_reply_to_addresses.php
	protected/migrations/m120927_075937_add_new_durations_to_drug_duration_table.php
	protected/migrations/m121001_144444_add_description_field.php
	protected/migrations/m121002_121025_new_multiple_diagnoses_table.php
	protected/migrations/m121031_085020_remove_hyphens_from_nhs_numbers.php
	protected/migrations/m121114_132152_remove_booking_tables.php
	protected/migrations/m130115_083943_unbooked_procedures.php
	protected/migrations/m130121_083227_benefits_and_risks_should_be_linked_to_subspecialty_rather_than_service.php
	protected/migrations/m130218_085437_new_procs_oe2661.php
	protected/migrations/m130222_115501_complications_and_benefits.php
	protected/migrations/m130301_094914_ozurdex_proc.php
	protected/migrations/m130320_144412_contacts_refactoring.php
	protected/migrations/m130409_101123_give_non_consultant_users_a_staff_contact_label.php
	protected/migrations/m130424_072109_fluorescein_angiography_should_be_unbooked.php
	protected/migrations/m130424_095050_trabectome_procedure.php
	protected/migrations/m130426_082237_trabectome_is_common_for_glaucoma.php
	protected/migrations/m130429_133030_site_institution_import_tables.php
	protected/migrations/m130430_141855_person_import_fields.php
	protected/migrations/m130523_113015_new_access_level.php
	protected/migrations/m130603_114507_normalise_audit_table.php
	protected/migrations/m130717_102933_complications_and_benefits_should_be_linked_to_procedure_only.php
Track consolidations
Formatting cleanup
Fixed consolidation cleanup
Merge branch 'jira/3584' into develop