Cambios varios.
Merge branch 'master' of https://github.com/olmo/portfolio

Conflicts:
	protected/views/layouts/main.php