Layout actualizado
Merge commit 'd252213eb8ff07cf3f9528e1b3adf31baf125f91'
Merge branch 'master' of github.com:xiumeteo/omelette

Conflicts:
	application/protected/views/layouts/main.php