revert to demo for the master
modifications in order for canopy to usable as python.
Merge branch 'master' into lt1

Conflicts:
	init/80_create_instruments.py