Adds storage of selected branch in the broker. Adds temporary toasters to show conflicts.
Adds to code to find new commits
Adds toaster for conflicting files. OnAllCommitsReceived now reurns a Map instead of a list
Merge with dev