Use /user-media/ as media path instead of /storage/ (bug 1013865)

/storage/ conflicts with some other URL config (/storage/shared_storage/
for example)

@diox @jasonthomas r?