Merge pull request #127 from molaux/master

Doctrine 2 Annotations One to One associatons
Merge remote-tracking branch 'upstream/master'