bdd l30host
Merge branch 'master' of github.com:l30bravo/tucomic

Conflicts:
	protected/config/main.php
Merge branch 'master' of github.com:l30bravo/tucomic
Versión Miercoles tarde