- Can now list modified and conflicted files.

- Changes the merge policy when dealing with delete vs modify
situations.
Fixes a bug when merging newly created files.
- Removes some unused code.

- Gives a default value to user.
Adds GIT repo support to slyd project API
Extends JS client API to consume git repo methods
Adds a method to serialise an object's type
Removes trailing spaces.
Remove debug code.
Automated conflicts resolver UI.