CRM-14300 fix - Slow query - participant report

https://issues.civicrm.org/jira/browse/CRM-14300
Minor change
Merge branch 'CRM-14300' of github.com:monishdeb/civicrm-core into CRM-14300

Conflicts:
	CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl
	sql/civicrm_generated.mysql

----------------------------------------
* CRM-14300: Slow query - participant report
  https://issues.civicrm.org/jira/browse/CRM-14300
CRM-14492 - Show admin-only price fields on front end event info and event registration pages if the user is logged in and has administer CiviCRM permission.

----------------------------------------
* CRM-14492:
  https://issues.civicrm.org/jira/browse/CRM-14492
CRM-11302 - CRM/Mailing - Optout/Unsubscribe verification
Merge pull request #3005 from kurund/CRM-14300

CRM-14300
Merge pull request #3006 from davecivicrm/CRM-14492

CRM-14492 - Show admin-only price fields on front end event info and eve...
Merge branch 'master' of github.com:KarinG/civicrm-core
CRM-14527 migrate cid=0 to use entity ref
remove redundant where clause
Merge pull request #3013 from deepak-srivastava/CRM-14453

remove redundant where clause
appropriate base table for source activities
Merge pull request #3014 from deepak-srivastava/CRM-14452

appropriate base table for source activities
Web Test Fix
CRM-14350 add test to check for reported E-Notice
Merge pull request #3017 from eileenmcnaughton/tests

CRM-14350 add test to check for reported E-Notice
Merge pull request #3012 from eileenmcnaughton/CRM-14527

CRM-14527 migrate cid=0 to use entity ref
Merge branch 'master' of git://github.com/civicrm/civicrm-core
Merge pull request #3016 from jitendrapurohit/Import_Webtest

Web Test Fix
Merge branch 'master' of git://github.com/civicrm/civicrm-core