Merge origin/develop into develop

Conflicts:
	Beneficiarios/src/com/globalintegrator/dao/StoreProcedureDAO.java
	Beneficiarios/src/com/globalintegrator/data/Main.java
	Beneficiarios/src/com/globalintegrator/model/Beneficiario.java