Merge origin/master

Conflicts:
	nbproject/genfiles.properties
	nbproject/project.properties
	src/java/com/fia/upeu/dao_imple/ModeloUsuario.java
Merge origin/master