Resolvendo conflitos com AssociadoBean
Merge origin/master

Conflicts:
	src/main/java/br/com/jjv/sintraf/beans/AssociadoBean.java