add difftool support
Fix jscs code style error
Don't timeout difftool
Enable history difftool button based on git config
if no git config diff.tool, disable setting
Merge remote-tracking branch 'gilly3/master'

Conflicts:
	nls/zh-cn/strings.js