added diff settings dialog, versioning bug fixing, layout fixes
Merge remote-tracking branch 'origin/master'