correct composer.json and add composer.lock
Merge branch 'composer' of https://github.com/robinlehrmann/oxideshop_ce into composer

Conflicts:
	composer.json