Merge pull request #127 from molaux/master

Doctrine 2 Annotations One to One associatons
Doctrine 2 anotations : one to one bidirectional cross dependance
Merge branch 'master' into yaml2.6
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into yaml2.6