Added jmiguelsamper and ultraq as developers to pom.xml
Merge branch '2.0-master' into 2.0-dev