pedo background
Merge branch 'master' of github.com:eagledu/GETOBJ

Conflicts:
	Pedometer/ProjectPrivate/UI/PEDPedoData4SleepViewController.m