Merge branch 'master' of https://github.com/jeff83/xcore

Conflicts:
	src/main/java/com/cmbc/codegenerator/PdmGenerator.java