MPS-19916 Evaluate Breakpoint Applicability based on Node Instance
MPS-19916 Evaluate Breakpoint Applicability based on Node Instance - generator
MPS-13852 Several attempts to show annotations in the editor result in several annotation columns being displayed
MPS-20161 [build:IC-999.SNAPSHOT] run in EDT failure: editing while annotation is on
MPS-19916 Evaluate Breakpoint Applicability based on Node Instance - leave binary compatibility inside 3.1.x
MPS-19916 Evaluate Breakpoint Applicability based on Node Instance - rename virtual folders for concept functions
MPS-19916 Evaluate Breakpoint Applicability based on Node Instance - migration
Merge remote-tracking branch 'origin/MPS3.1' into 3.1/mikev/test
make
Merge remote-tracking branch 'origin/MPS3.1'

Conflicts:
	plugins/debugger-api/api/jetbrains/mps/debug/api.mps
make