wordpress upgrade
Merge branch 'develop' of github.com:ajency/BenSmiley
Merge branch 'develop'

Conflicts:
	wp-content/plugins/index.php
	wp-content/plugins/jonradio-multiple-themes/includes/admin.php
	wp-content/plugins/jonradio-multiple-themes/includes/functions.php
	wp-content/plugins/jonradio-multiple-themes/includes/old-wp.php
	wp-content/plugins/jonradio-multiple-themes/includes/select-theme.php
	wp-content/plugins/jonradio-multiple-themes/jonradio-multiple-themes.php
	wp-content/plugins/jonradio-multiple-themes/readme.txt
	wp-content/plugins/jonradio-multiple-themes/uninstall.php
Merge branch 'master' of git.wpengine.com:production/chatcat into develop