Doctrine 2 added
Doctrine 2 added
Merge origin/master