changes made in spa-style.css and upload-view.coffee
Merge branch 'develop' of https://github.com/ajency/BenSmiley into develop