help content, pictures, examples-icon
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/img/tour/DADIcon.png
	src/index.html
help pictures