Merge branch 'dev' into 34-feature-add-context-free-connect

# Conflicts:
#	ragconnect.base/src/main/jastadd/Analysis.jrag
#	ragconnect.base/src/main/jastadd/Errors.jrag
#	ragconnect.base/src/main/jastadd/Intermediate.jadd
#	ragconnect.base/src/main/jastadd/Intermediate.relast
#	ragconnect.base/src/main/jastadd/Mappings.jrag
#	ragconnect.base/src/main/jastadd/NameResolution.jrag
#	ragconnect.base/src/main/jastadd/Navigation.jrag
#	ragconnect.base/src/main/jastadd/RagConnect.relast
#	ragconnect.base/src/main/jastadd/parser/ParserRewrites.jrag
#	ragconnect.base/src/main/jastadd/parser/RagConnect.parser
#	ragconnect.base/src/main/resources/ragconnect.mustache