Merge pull request #121 from crawley/datafile-migration

Datafile migration
Fix for bug in the license selection form that was causing the license
to be changed prematurely.