changed some code in regards to file upload listing.
Merge branch 'test' into dev