Corrige static_url para o portalcni
Merge branch 'master' of https://github.com/shuhikari/dark-ride

Conflicts:
	project/project/settings.py
Merge branch 'master' of https://github.com/shuhikari/dark-ride
Corrige settings para o servidor cni.intip.com.br/categorias
Merge branch 'master' of https://github.com/shuhikari/dark-ride