puntajes
Merge branch 'master' of https://github.com/ProgApp2014/web
puede puntuar
puntajes
Merge branch 'master' of https://github.com/ProgApp2014/web

Conflicts:
	src/conf/xml-resources/web-service-references/ordenesWS/wsdl/localhost_8094/ordenesWS.xsd_1.xsd
	src/conf/xml-resources/web-service-references/productosWS/wsdl/localhost_8094/productosWS.xsd_2.xsd
	src/conf/xml-resources/web-service-references/usuariosWS/wsdl/localhost_8094/usuariosWS.xsd_1.xsd
	web/WEB-INF/wsdl/localhost_8094/ordenesWS.xsd_1.xsd
	web/WEB-INF/wsdl/localhost_8094/productosWS.xsd_2.xsd
	web/WEB-INF/wsdl/localhost_8094/usuariosWS.xsd_1.xsd