Merge branch 'preprod' into 'master'

added punctuation to sentences, placed max upload size more prominent, added...

See merge request !190