adaptacao telas 4s e 5
Merge remote-tracking branch 'origin/master'