make JMSDiExtraBundle dependency optional
Merge pull request #313 from lsmith77/make_di_extra_optional

make JMSDiExtraBundle dependency optional
removed in favor of repository configuration
updates version
Merge branch 'master' of https://github.com/schmittjoh/JMSSerializerBundle

Conflicts:
	composer.json
Merge branch 'master' of https://github.com/markrunaway/JMSSerializerBundle into patch1

Conflicts:
	composer.json