Merge branch '1.0/dev'

Conflicts:
	skins/BlueSpiceSkin/BlueSpiceSkin.skin.php
Merge branch 'master' of https://github.com/MediaWiki/MediaWiki-Pinnacle

Conflicts:
	skins/BlueSpiceSkin/BlueSpiceSkin.skin.php