Updated Emanuel's email address in pom.xml
Merge branch '2.0-dev' into 2.0-master