Updated files
Merge branch 'master' of https://github.com/ajgustafsson/mde

Conflicts:
	org.eclipse.acceleo.module.sampleCustom/Workflow.java
	org.eclipse.acceleo.module.sampleCustom/src/org/eclipse/acceleo/module/sampleCustom/main/Merge.mtl