detalles y reportes
Merge branch 'master' of https://github.com/Chompas/donalo-tdp

Conflicts:
	client/app/main/campaigns/details/details.jade