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
Latest state of development

Change-Id: I62acd28cec8b33febce1c85d002bb3ed9d441cbc
Latest state of development

Change-Id: I75736fd220d059e85dfa5583f5d322917dadb178
Remove unused globals

Change-Id: I7d13ed61925c6736bd367750e6b016b035d3c2f9
Don't use $wgArticle when we're not a global

Change-Id: I90447c73d7a0c283a67a9e80d95044659e71c977
Latest state of development

Change-Id: I852dc1657bc4bc3e9f0e3168ca19a7afc32c6a38
Merge "Don't use $wgArticle when we're not a global"
Latest state of development

Change-Id: I718756de4cb024d2f987f39d374ff2fbe6df2858
Latest state of development

Change-Id: I06ff70ea91193204e71e384f39da4d4fa9599053
Latest state of development

Change-Id: I9e62f21456dedf493431cf6120156ca547e0de42
Remove final usage of $wgArticle anywhere in git

Change-Id: I19402dc814c8e9ac5187925cb142368d9acbeb5c
Latest state of development

Change-Id: Ic7335c270cfec4aad01f4d0cd69b431786397a56
Implemented changes for getting into translatewiki

Changed order of messages: FIRST en, SECOND qqq, AFTER THAT doesn't matter
Removed unused lines
Corrected en message

Change-Id: I86c39ff6cb42f5a22e91e635eb66e4cd63b704a9
Implemented changes for getting into translatewiki

Changed order of messages: FIRST en, SECOND qqq, AFTER THAT doesn't matter
Changed line endings to UNIX

Change-Id: I3e308872ed170f9bd02fee484d2035a1925d39ce
Implemented changes for getting into translatewiki

Changed order of messages: FIRST en, SECOND qqq, AFTER THAT doesn't matter
Removed unused lines

Change-Id: I44e6a10f9d55429963aa7c1c89723b2663876ab1
Add newline at end of file to unbreak translatewiki.net scripts

Change-Id: Ia431fd6c0562490f8e99b7b17d2b3e727fa07016
Merge "Implemented changes for getting into translatewiki"
Add newline at end of file to unbreak translatewiki.net scripts

Change-Id: I3170015743d1b44748104611a5ff6ae75b9285dc
Merge "Implemented changes for getting into translatewiki"
Implemented changes for getting into translatewiki

Changed order of messages: FIRST en, SECOND qqq, AFTER THAT doesn't matter
Added GENDER support to personalized messages
Removed trailing whitespaces
Implemented suggestions
Changed message keys
Fixed some punctuations
Removed some messages
Removed HTML from messages

Change-Id: I7d71828ba3d394674e55fb5bc809df27bf909eeb