Merge origin/master

Conflicts:
	src/java/bean/PessoaJuridicaBean.java
	src/java/service/ReaverResource.java
Merge origin/master