Merge branch 'develop-olympus' into develop-ascraeus

Conflicts:
	language/de/acp/common.php
	language/de/install.php
	language/de/ucp.php
	language/de_x_sie/acp/common.php
	language/de_x_sie/install.php
	language/de_x_sie/ucp.php