Merge remote-tracking branch 'origin/HEAD' into HEAD
Merge branch 'origin/devel'

Conflicts:
	index.html
Merge branch 'origin/devel'

Conflicts:
	index.html