Conflicts:
	config.template/safemode-settings.php
	includes/AutoLoader.php
	includes/CommonAJAXInterface.php
	includes/Core.class.php
	includes/SpecialPage.class.php
	includes/html/htmlformfields/HTMLMultiSelectEx.php
	includes/html/htmlformfields/HTMLMultiSelectPlusAdd.php
	includes/utility/NamespaceHelper.class.php
	includes/utility/PageContentProvider.class.php
	includes/validator/Validator.class.php
	languages/BlueSpice.ExtJS.Portal.i18n.php
	resources/Resources.php
	resources/bluespice.extjs/BS/portal/Portlet.js
	resources/bluespice.extjs/BS/portal/PortletConfig.js
	resources/bluespice/images/bs-poweredby_bluespice_88x31.png

Change-Id: I9ea09a3f82ce684251965c8823e74f6bf1466d41