Merge pull request #39 from NeuralEnsemble/development

Development
Updating to latest Schema & regenerated nml.py
Merge branch 'master' into development

Conflicts:
	neuroml/nml/nml.py