add parent activity for schedule and change schedule logic
Merge branch 'master' of https://github.com/YGLiu/RunMyWay
implement conflicts between schedule and calendar, schedule and history