-- webtest fixes and some inprovements based on the error on server
CRM-13346 add contribution page column and filter to contribution summary and detail report.

----------------------------------------
* CRM-13346: Add Contribution Page column and filter to Contribution Summary and Detail reports
  http://issues.civicrm.org/jira/browse/CRM-13346
User friendly search builder operator labels
Merge pull request #1614 from monishdeb/CRM-13323

CRM-13323 fix
Merge pull request #1609 from colemanw/ops

User friendly search builder operator labels
Merge pull request #1605 from ravishnair/webtestfix

-- webtest fixes and some improvements based on the error on server
Merge pull request #1606 from davecivicrm/CRM-13346

CRM-13346 add contribution page column and filter to contribution summar...
Fix contact tag tab with tagsets
Merge pull request #1615 from colemanw/master

Fix contact tag tab with tagsets
Tag js cleanup
CRM-13329, add 2 more rows

----------------------------------------
* CRM-13329: Add 2 more rows to the Badge Layout form (for a total of 6 rows)
  http://issues.civicrm.org/jira/browse/CRM-13329
CRM-13329, added spacer

----------------------------------------
* CRM-13329: Add 2 more rows to the Badge Layout form (for a total of 6 rows)
  http://issues.civicrm.org/jira/browse/CRM-13329
applied patch for CRM-13357
Merge pull request #1617 from kurund/CRM-13329

CRM-13329, added more rows for event name badges
-- CRM-13352 applied the fix

----------------------------------------
* CRM-13352: After disabling some Event Types I don't need, get undefined index error in Event Template browse()
  http://issues.civicrm.org/jira/browse/CRM-13352
Merge pull request #1618 from ravishnair/CRM-13352

-- CRM-13352 applied the fix
Merge pull request #1616 from yashodha/CRM-13357

applied patch for CRM-13357
CRM-13339 improvised changes

----------------------------------------
* CRM-13339: CRM_Core_PseudoConstant warnings
  http://issues.civicrm.org/jira/browse/CRM-13339