Merge pull request #36 from eagledu/master

merge  switch pedo and sleep view 130513
bar char and  graphic 4 sleep
Merge branch 'master' of https://github.com/TaylorLi/GETOBJ

Conflicts:
	Pedometer/ProjectPrivate/XIB/PEDBarchart4SleepViewController.xib
	Pedometer/ProjectPrivate/XIB/PEDGraphs4SleepViewController.xib
fix Conflict
Merge pull request #22 from TaylorLi/master

bar char and graphic 4 sleep