move old-scms-images to old-scms-content
rename /media/upload/ to /
Merge branch 'master' of ssh://github.com/smogon/scms