Revert "Revert "revert on master the webpack merge commit""
Revert "Revert "revert on master the webpack merge commit""

This reverts commit 14990b2b80f9a010a2a3220d6d798a8add297196.

CilantroOrg/CilantroVegOrg,CilantroOrg/CilantroVegOrg,CilantroOrg/CilantroVegOrg