Reversion + Button progress
Merge branch 'master' of https://github.com/EmersonGGS/Helpr

Conflicts:
	Farm Fresh
Simcoe.xcodeproj/project.xcworkspace/xcuserdata/n00618011.xcuserdatad/Us
erInterfaceState.xcuserstate