merge  switch pedo and sleep view 130513

merge  switch pedo and sleep view