rev symfony and JMS serializer version; fix broken autoload of annotation class path in controller annotationreader test
Merge branch 'master' of github.com:matmar10/rest-api-bundle

Conflicts:
	composer.json