Added timeline intteraction, and conflict listing
Merge branch 'master' of https://github.com/sankalpk/UnitProject