Details of the conflict now update dynamically
Added buttons for the details view, began implementing map update
Merge branch 'master' of https://github.com/sankalpk/UnitProject