reworking file upload structure
Merge branch 'master' of https://github.com/DTLT/umwblogs

Conflicts:
	pages/creating-content/uploading-and-linking-to-files.txt
Merge branch 'master' of https://github.com/DTLT/umwblogs