Merge origin/master

Conflicts:
	src/main/java/br/esp/sysevent/core/dao/ConfraternistaDaoBean.java