Wordpress installed in its own folder using features/composer.json
Using johnpbloch/wordpress-core-installer instead of custom installers
Merge branch 'master'

Conflicts:
	packages.json