fix some bugs
fix bug with pets relationship
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/PCA/UserBundle/Resources/config/_doctrine/Pet.orm.yml