added conflict display
Merge branch 'master' of https://github.com/gbgarage/meetingplanner.git