Added dependency injection container and serializer
Merge remote-tracking branch 'origin/master'

Conflicts:
	composer.json
	composer.lock