delte controller
Merge remote-tracking branch 'origin/master'

Conflicts:
	nbproject/private/private.xml
	protected/models/Agents.php
rosas martes comiit mañanero
rosa comit mañanero v2
comit mañanero v3
algo
commit mañanero
cambiso rossas
Revert "cambiso rossas"

This reverts commit 7ef1e2fc68a009db69ba585e92d36b6a384050a8.
Revert "delte controller"

This reverts commit 60cfb9ac3a7a70ecc5706178e142e3f9798d61b3.

Conflicts:
	nbproject/private/private.xml