middle of testDiff (determine whether push update to parent)
Merge branch 'development' of https://github.com/guoger/EP2300 into development