Merge branch 'master' of https://github.com/rafaelcardososilva/appCrianca

Conflicts:
appCrianca/MenuViewController.m