Resources/Template roots -> Project structure
moved template language setting to the integrated tools
avoid stripping whitespaces on caret lines on document save (IDEA-80056)
EA-54197 - IAE: HgTagBranchCommand.collectNames

*log warning and get all branch names as opened if hg executable is not valid
Merge remote-tracking branch 'origin/master'
Platform: disabled image interpolation on resize in the viewer (IDEA-98635)
use embedded tokes for templates instead of injections
#WEB-11115 fixed
Disable 'Statement has no effect' for all string literals (PY-12194)

According to BDFL, it is valid to use them as comments.
Merge branch 'disable-strings-no-effect'
isRetina fix for headless mode
reviewed by kb
IDEA-121140 Format spock DSL in script body
IDEA-95011 diff: better handling of FilesTooBigForDiffException in merge dialog
svn: Fixed NPE in SvnConfiguration - initialize inner state to default value
restored platform prefix autodetection to fix sql tests
Merge branch 'svn_18_3'
Merge remote-tracking branch 'origin/master'
cleanup
CR-IC-4514 @NotNull
IDEA-121193 Don't show 'Class already exists' error if there are two groovy classes with the same qualified name in different modules
Enable multicaret for live templates