commit antes de bajar
back 2
back3
Merge remote-tracking branch 'origin/master'

Conflicts:
	SGIA/ejb/src/main/java/uy/com/ceoyphoibe/SGIA/controller/RegistroFactor.java
	SGIA/ejb/src/main/java/uy/com/ceoyphoibe/SGIA/model/Factor.java
	SGIA/web/src/main/webapp/WEB-INF/templates/default.xhtml