Merge origin/master

Conflicts:
	src/BancoConexao/hibernate.cfg.xml
manipular inserir