Updated to WordPress 4.0.
Removed JSON API plugins.
Merge remote-tracking branch 'origin/master'

Conflicts:
	composer.lock