Merge remote-tracking branch 'origin/feature_moretext'

Conflicts:
	index.php
up to date