update doctrine orm to dev master
Merge branch 'master' of github.com:exu/factory-girl-php

Conflicts:
	composer.json