Conserto e Pagina Identifica
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/layout/script/layout.phtml