Turned off debugging
Make static and media urls fall below the base url
Merged changes