domain plans ui added
some more files
some more files added
Merge branch 'master' of https://github.com/ajency/BenSmiley

Conflicts:
	wp-content/themes/binpress/PHPModules/users/forgot-password/ajax.php
	wp-content/themes/binpress/PHPModules/users/forgot-password/functions.php
	wp-content/themes/binpress/PHPModules/users/user-activation/functions.php
	wp-content/themes/binpress/SPA/apps/header/show/header-controller
	wp-content/themes/binpress/SPA/apps/header/show/header-controller.js
	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/apps/user-profile/templates/userprofile.html
	wp-content/themes/binpress/SPA/controllers/region-controller.coffee
	wp-content/themes/binpress/SPA/dashboard.spa.coffee
	wp-content/themes/binpress/SPA/dashboard.spa.js
	wp-content/themes/binpress/SPA/entities/user-entities.coffee
	wp-content/themes/binpress/SPA/entities/user-entities.js
	wp-content/themes/binpress/functions.php
	wp-content/themes/binpress/grunt/package.json
	wp-content/themes/binpress/js/require.config.js