Helps faltantes
Merge branch 'Integracion&ControlDeCalidad' into 2014-11HO/DP-Mejoras

Conflicts:
	product_msl/objects/stock.py
Merge branch '2014-11HO/DP-Mejoras' into Integracion&ControlDeCalidad