Merge branch 'master' of https://github.com/ajency/BenSmiley

Conflicts:
	wp-content/themes/binpress/PHPModules/users/user-profile/ajax.php
	wp-content/themes/binpress/PHPModules/users/user-profile/functions.php
	wp-content/themes/binpress/SPA/apps/upload/upload-controller.coffee
	wp-content/themes/binpress/SPA/apps/upload/upload-controller.js
	wp-content/themes/binpress/SPA/apps/upload/upload-view.coffee
	wp-content/themes/binpress/SPA/require.config.coffee
	wp-content/themes/binpress/functions.php