-Fixed warnings

Signed-off-by: imm <imm>
Merge branch 'master' of https://github.com/gonzalomelov/geored-uy.git

Conflicts:
	src/main/java/org/gonzalomelov/georeduy/bll/service/CompanyManagement.java


Signed-off-by: imm <imm>