Upload_id is now part of modusdata in myuploads.
FIx merge, upload_id now part of myuploads data
Merge branch 'master' of github.com:simgul-1/modus

Conflicts:
	app/routes.js
	views/pages/myuploads.ejs