removed uploads folder
deploy changes
Merge branch 'master' into shibumi