main
log
log
ajustes de maqueta en app
Merge branch 'master' of https://github.com/dmarcow/savant_fabogesic

Conflicts:
	app/protected/config/main.php
	app/protected/runtime/application.log