cambios que no recuerdo
Merge remote-tracking branch 'origin/saabCarlos'
Merge branch 'master' of https://github.com/SAABAPP/saab

Conflicts:
	protected/views/requerimiento/_form.php
	protected/views/requerimiento/create.php