lele
Lala #15
lili
Merge branch 'develop' into janela

Conflicts:
	ei
Merge pull request #22 from mira/janela

Janela