BAC-534: schema change
BAC-534: internal comments for Phalanx blocks
Merge branch 'dev' into bac-534-phalanx-internal-comments

Conflicts:
	extensions/wikia/PhalanxII/Phalanx.i18n.php
Merge pull request #1107 from Wikia/bac-534-phalanx-internal-comments

BAC-534: internal comments for Phalanx blocks