Fix de Constructores en Mocks
Merge branch 'master' of https://github.com/facultad/75-10-2013-1-tp-grupal

Conflicts:

workspace/HyperMarket/src/ar/uba/fi/tecnicasdedisenio/grupo8/hypermarket
/promocion/test/mock/ItemVentaMock.java