CRM-12274

----------------------------------------
* CRM-12274: Merge activity tables into one unified table activity contact table
  http://issues.civicrm.org/jira/browse/CRM-12274
Merge pull request #436 from dlobo/CRM-12274

CRM-12274
CRM-12274
CRM-12274
 CRM-1227
Merge pull request #442 from yashodha/CRM-12274

Crm 12274