Re-wiring up the upload input stuff in toolbar
Merge branch 'backbone' of github.com:prose/prose into backbone