EDF
new version EDF
Merge branch 'war' into ejb