Avoid empty spaces at the end of the expressions
Allow to navigate between markings (colors in the trees)
Reviewed model according to CTRL-R messages
Override scope enumeration and set default scope for paragraph
Bug fix #434
Corrected scopes of paragraphs
Corrected warning messages
Removed (was added accidentally)
Merge branch 'Upstream/master'