changes made in upload-view.coffee, spa-styles.less
Merge branch 'develop' of https://github.com/ajency/BenSmiley into develop

Conflicts:
	wp-content/themes/binpress/SPA/apps/user-domains/templates/AddEditUserDomain.html