Make static and media urls fall below the base url
Merge branch 'master' into dev