see changelog 1.0
Merge branch 'develop'

Conflicts:
	pympi/Elan.py