Merge pull request #37 from NeuroML/development

Merge to master for NeuroML v2beta3 release
Merge branch 'master' into development