[MERGE]

addons/mrp/mrp.py

addons/mrp/procurement.py

addons/mrp/report/bom_structure.py

addons/mrp/report/mrp_production_order.py

addons/mrp/report/order.py

addons/mrp/report/workcenter_load.py

addons/mrp/test/mrp_phantom_bom.yml

addons/mrp/wizard/mrp_change_standard_price.py

addons/mrp/wizard/mrp_product_produce.py

addons/mrp_jit/__openerp__.py

addons/mrp_jit/test/mrp_jit.yml

addons/mrp_operations/mrp_operations.py

addons/mrp_repair/mrp_repair.py

addons/mrp_repair/mrp_repair_view.xml

addons/mrp_repair/test/test_mrp_repair.yml

addons/mrp_subproduct/__openerp__.py

addons/mrp_subproduct/test/mrp_subproduct.yml

addons/product/product_demo.xml