BAC-533: Group labels on Phalanx special page
Merge branch 'dev' into bac-533-group-labels-in-phalanx

Conflicts:
	extensions/wikia/PhalanxII/Phalanx.i18n.php
BAC-533: fix handling of type selection from URL parameter (use logic from PhalanxPage)
Merge pull request #1081 from Wikia/bac-533-group-labels-in-phalanx

BAC-533: Group labels on Phalanx special page