demo commit?
Merge remote-tracking branch 'origin/master'

Conflicts:
	demo/data/image_settings_sheila.dat
	demo/data/window_settings_sheila.dat