GiMac Recovery
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gauge/Gauge.xcodeproj/project.xcworkspace/xcuserdata/gianni.xcuserdatad/UserInterfaceState.xcuserstate