Dev copy, added upload page files. Ready for merging

Made a new branch from dev and added upload page files to ease the merging. (Something went wrong when trying to merge Upload to dev)