Merge branch 'master' of https://github.com/ddelvecchio/emf.git
Merge branch 'maven_spring_integration' of https://github.com/ddelvecchio/emf into maven_spring_integration