Merge
修正calcUtility上下位移被算入总路程的Bug
Merge branch 'master' of github.com:TongjiFellow/RunEveryday

Conflicts:
	src/edu/tj/sse/runeveryday/utils/CalcUtil.java
pull