Testes
Excluding log4j.xml
Using jadira types
Merge branch 'dev'