file uploading but returning ajax partial
Ajax uploads complete with error handling
tidying trim links view
Merge branch 'master' into ajax-trim-uploads
Merge branch 'ajax-trim-uploads' into master