Merge pull request #2606 from kurund/CRM-14311

bad merge fixes
Merge pull request #2607 from kurund/CRM-14311

added metadata to entities, CRM-14311
Merge pull request #2608 from kurund/CRM-14311

fixed bad merge
fixed bad entities, CRM-14311

----------------------------------------
* CRM-14311: Add metadata to doctrine entities
  http://issues.civicrm.org/jira/browse/CRM-14311