renombrando la carpeta static
Merge branch 'master' of http://github.com/charlieweb/sitioadic
fix static media
fix setting
fix setting
fix setting
fix admin
fix admin
fix admin
Merge remote-tracking branch 'carlos/master'