Merge pull
Merge pull
Merge branch 'master' of https://github.com/jahd2602/ImprentaEdangie.git

Conflicts:
	EdangieApp/nbproject/private/private.properties
	EdangieJairoBranch/nbproject/genfiles.properties
	EdangieJairoBranch/nbproject/project.properties
	EdangieModel/src/com/edangie/model/Proveedor.java