hh
Merge remote-tracking branch 'origin/master'

Conflicts:
	pedibox/nbproject/project.properties
	pedibox/nbproject/project.xml
	pedibox/www
	pedibox/www/js/controllers.js
	pedibox/www/templates/detalle-pedido-usuario.html
	pedibox/www/templates/hacer-pedido.html
	pedibox/www/templates/mis-pedidos.html