Merge branch 'master' into 64

Conflicts:
	FitGuider/FitGuider/FitGuiderViewController.h
Merge branch 'master' into hi_man

Conflicts:
	FitGuider/FitGuider/FitGuiderViewController.h
Change
hhh
1

1
2

2
Merge branch 'hi_man'

Conflicts:
	FitGuider/FitGuider/FitGuiderViewController.h
	FitGuider/FitGuider/FitGuiderViewController.m
3