Merge pull request #21 from eagledu/master

Update version 130305
commit pedodata page
Merge branch 'master' of https://github.com/TaylorLi/GETOBJ

Conflicts:
	Pedometer/Pedometer.xcodeproj/project.pbxproj
commit pedo data page
Merge Pedo Data View conflict