change location of old-oxid source
Merge branch 'release/mergeeshop'
Merge tag 'mergeeshop' into develop

import of oxid-core