Merge branch 'composer' of https://github.com/robinlehrmann/oxideshop_ce into composer
Merge branch 'composer' of https://github.com/robinlehrmann/oxideshop_ce into composer