fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	channel.html
	global.html
	images.html