Upgraded to WordPress 4.0
Merge branch 'master' into production

* master:
  Upgraded to WordPress 4.0