Portada
Merge branch 'fp-dev'

Conflicts:
	protected/views/layouts/main.php