uploads page added
Merge origin/master
uploads page added_some changes added