naiveshark - 2015-09-04

New feature in 0.3 version:
1. Call the external Diff\Diff3 utility in conflict resolver dialog.