Merge branch 'master' of https://github.com/metaborg/metac into MetaC4Dario
Merge branch 'master' into MetaC4Dario
fixed for loop with declaration desugaring
?? added statemachines
Merge branch 'master' of https://github.com/metaborg/metac into MetaC4Dario

Conflicts:
	syntax/MetaC.generated.pp

added testcases for state machines (usage)
Merge branch 'MetaC4Dario'
Merge branch 'master' of https://github.com/metaborg/metac

Conflicts:
	BaseC/trans/desugaring/desugar.str
	Statemachine/trans/Statemachine-mapping.str
	Statemachine/trans/generation/builders.str
	trans/metac.str
Merge branch 'master' of https://github.com/metaborg/metac
test cases for multiple modules and typedef
Merge branch 'master' of https://github.com/metaborg/metac

Conflicts:
	BaseC/trans/desugaring/desugar.str
Merge branch 'master' of https://github.com/metaborg/metac