Moved most recent database upgrade script to go directly after the current version rather than skipping past two other upgrade versions to maintain consistency regarding version numbers and when things were merged into develop.
fixed bug whereby event_topics weren't being copied forward when the draft importer was used. Refs #424
Merge branch 'develop' into feature-templates