Fix bug in settings browser that can in certain situations result in an inability to look at history of a conflicting value, and other minor bugfixes
Merge pull request #3 of https://github.com/Mike-GC/wix4 into develop

Conflicts:
	History.md