Merge pull request #105 from GarthSnyder/2.3.1-j7-wip

Minor edits to File Upload docs: rm dup sentences, fix formats, clarify
Fixed catincan badge
Update README.md

Removed link to gofundme
Added link to catincan
Added mailinglist subscribe to docs
Updated docs: "File upload image preview works fine on recent Safari". Fixes #97
Merge branch 'master' of github.com:jasny/bootstrap
Using 'p' instead of 'j' in version
Fixed broken composer.json
Merge remote-tracking branch 'upstream/master'