#18
Merge branch 'development' of https://github.com/tassoevan/cv2-portal into development

Conflicts:
	protected/apps/main/templates/cadastro/completar.twig