Merge origin/master

Conflicts:
	CurralDeMoinas/src/gui/PnExibicao.form
	CurralDeMoinas/src/gui/PnExibicao.java