commit changes in PhalanxII extension
Merge branch 'phalanx-redoux' of github.com:Wikia/app into phalanx-redoux

Conflicts:
	extensions/wikia/PhalanxII/Phalanx_setup.php