update
Merge branch 'statemachine' of https://github.com/metaborg/metac into statemachine

Conflicts:
	Statemachine/syntax/Statemachine-in-Base.tmpl
	Statemachine/syntax/Statemachine.tmpl
	Statemachine/trans/namebinding.nd
	Statemachine/trans/statemachine-error-report.str