[TASK] Allow upload fiels
Merge branch 'task/allow_upload_files'

Conflicts:
	routes/profiles.js
Merge remote-tracking branch 'origin/master'