major changes in data structures
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	papi/plugin/io/sinus/Sinus.py
major changes in data structures