Updated wordpress
Merge branch 'master' into carbonmaster

Conflicts:
	packages.json