Merge origin/master

Conflicts:
	RecetaAlToque-ejb/nbproject/project.properties
	RecetaAlToque-ejb/setup/glassfish-resources.xml
	RecetaAlToque-war/nbproject/build-impl.xml~
Merge origin/master

Conflicts:
	RecetaAlToque-ejb/nbproject/project.properties
	RecetaAlToque-ejb/setup/glassfish-resources.xml
	RecetaAlToque-war/nbproject/build-impl.xml~
Merge origin/master

Conflicts:
	RecetaAlToque-ejb/nbproject/project.properties
	RecetaAlToque-ejb/setup/glassfish-resources.xml
	RecetaAlToque-war/nbproject/build-impl.xml~