update from server@cht.local
Merge branch 'cht.local' into cht

Conflicts:
	images/slogan.png