setup file for PhalanxII + changes in directories
Merge branch 'phalanx-redoux' of github.com:Wikia/app into phalanx-redoux

Conflicts:
	extensions/wikia/PhalanxII/Phalanx_setup.php
phalanx setup file