Created import classes from EFS to EMF model
Merge remote-tracking branch 'origin/master'