Seta altura dos .user
Resolve conflito
Merge branch 'master' into equipe