Changes
Conflict Resolution commit

Merge remote-tracking branch 'origin/master'

Conflicts:
	org.kevoree.modeling.emf.kotlin.gencode/src/main/scala/org/kevoree/tools/ecore/kotlin/gencode/model/ClassGenerator.scala