Merge issues: settings imports changed to dg.settings and media folder location changed to inside dg.