removing zinnia from project
Merge branch 'master' of github.com:paulovillani/camprulho

Conflicts:
	abapi/admin.py
Merge branch 'master' of github.com:paulovillani/camprulho