teste
Merge branch 'master' of https://github.com/jeankirchner/representante

Conflicts:
	prax-config/src/br/prax/config/PraxConfig.java
	prax-representante-pedido-pdf/.classpath

merge