mod urls.py
Merge branch 'master' of github.com:paulovillani/camprulho
fixing zinnia things