json added to layout
Added Help button to resource bundle editor toolbar (IDEA-38492)
updated sh and bat launchers
updated mac launcher
Merge remote-tracking branch 'origin/master'
[log] Fix refs comparator: compare roots if ref managers are different
[git] IDEA-129935 Fix changes reported for merge commits

-m together with --name-status reports the merge commit twice: once
with the diff from first parent, once with the diff from second parent.

-c reports the commit only once and lists only files which were
modified from both parents (i.e. while resolving a merge conflict).
compiling evaluator - fixed evaluation inside inner classes