Updated demonstrator 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	demonstrator
Updated demonstrator 2