removing unused import
Merge remote-tracking branch 'origin/master' into multipleEditors
committing module file modified by IDEA.
replacing conceptFunctionReturnTyle link with getExpectedReturnType() behavior method
replacing conceptFunctionParameterType concept aggregation link with type system rule
correcting editor generator in order to use Style for setting focus policy
regenerating editors
workaround for typesystem problems
Using typesystem rule instead of getType() bevahior method for scope parameter types
correcting keymaps
removing keyevent keymap function parameter
KeyMap API interfaces were extracted
Removing unnecessary condition cell from editor
regenerating
Adding TMP method to fix unit-tests
Merge remote-tracking branch 'origin/master' into multipleEditors

Conflicts:
	languages/languageDesign/editor/source_gen/jetbrains/mps/lang/editor/behavior/BehaviorAspectDescriptor.java
	languages/languageDesign/editor/source_gen/jetbrains/mps/lang/editor/structure/StructureAspectDescriptor.java
	languages/languageDesign/editor/source_gen/jetbrains/mps/lang/editor/typesystem/TypesystemDescriptor.java
Merge remote-tracking branch 'origin/master' into multipleEditors
rebuilding language
regenerating models after merge
Merge remote-tracking branch 'origin/master' into multipleEditors