Keep django version on 1.4
Merge branch 'master' of github.com:ramalho/titans-group
WIP: dont remember exactly what i've done
Merge branch 'master' of github.com:erickwilder/titans-group

Conflicts:
	turma2/pizza/entrega/models.py
	turma2/pizza/entrega/templates/entrega/cliente_detail.html
	turma2/pizza/entrega/templates/entrega/cliente_list.html
	turma2/pizza/entrega/urls.py
	turma2/pizza/entrega/views.py