Merge branch 'mike_pre-beta_review' into develop

Conflicts:
ead_revised.rng