Statemachine namebinding update
Local commit of desugar.
local
Merge branch 'master' of https://github.com/metaborg/metac

Conflicts:
	BaseC/trans/desugaring/desugar.str
	Statemachine/test/ex.mc
	Statemachine/trans/statemachine-names.str
	syntax/MetaC.generated.pp
Merge branch 'master' of https://github.com/metaborg/metac
Ambiguity on Statemachine-in-BaseC removed.
Statemachine keywords added.
Module scoping in Statemachine/trans/statemachine-names.nd reversed.