Inicio Fernando
Merge branch 'master' of https://github.com/yowik/gestion/

Conflicts:
	nbproject/project.properties
	nbproject/project.xml