Update lala
Merge branch 'master' into teste4

Conflicts:
	lala