Arreglar cálculos en costo total, cálculo individual y pantalla de detalles.
Merge branch 'master' of https://github.com/odry1190/archy

Conflicts:
	app/Controller/ActivityProjectsController.php
	app/Controller/Component/ConverterComponent.php
	app/View/ActivityProjects/calculate_activity.ctp