Revert "Merge branch 'master' of https://github.com/JoaoSisanoski/TemplateParaiOSFinal"

Conflicts:

TemplateiOsFinal.xcodeproj/project.xcworkspace/xcuserdata/DaniloAM.xcuse
rdatad/UserInterfaceState.xcuserstate
	TemplateiOsFinal/Base.lproj/Main_iPhone.storyboard