Merge branch 'master' of https://github.com/marcelohirota/AppMetodoDeRose

Conflicts:

AppMetodoDeRose.xcodeproj/project.xcworkspace/xcuserdata/Hirota.xcuserda
tad/UserInterfaceState.xcuserstate
	AppMetodoDeRose/InformacoesEscola.m
	AppMetodoDeRose/ListaEscola.h
as
Merge branch 'master' of https://github.com/marcelohirota/AppMetodoDeRose

Conflicts:

AppMetodoDeRose.xcodeproj/project.xcworkspace/xcuserdata/Hirota.xcuserda
tad/UserInterfaceState.xcuserstate