.
Merge remote-tracking branch 'Diego/master'
Merge remote-tracking branch 'Diego/master'
PLAN PAGOS
Vistas
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/views/layouts/main.php
un par de pruebas
Vista de plan de pagos
Merge remote-tracking branch 'David/master'
Merge remote-tracking branch 'David/master'