Added upload to category, recently uploaded assets, category browsing
Merge remote-tracking branch 'origin/master'