Merge
Merge branch 'master' of https://github.com/eugeis/ee-mdd.git

Conflicts:
	src/main/groovy/ee/mdd/model/component/Names.groovy
	src/main/groovy/ee/mdd/templates/java/MacrosForJava.groovy
	src/main/groovy/ee/mdd/templates/java/cg/TemplatesForJavaCg.groovy