Añadiendo clases POJO en Usuario y Material
Merge branch 'master' of https://github.com/jlvarela/SAGPro

Conflicts:
	SAGProApp/SAGProApp-ejb/nbproject/project.properties
	SAGProApp/nbproject/project.properties
	SAGProWeb/nbproject/project.properties
Ahhh