fix CRM-12004
fix CRM-12005
-- Used openCiviPage and assertElementContainsText methods in webtests
Merge pull request #25 from ravishnair/webtest-fixes

-- Used openCiviPage and assertElementContainsText methods in webtests
fix CRM-12007
fix CRM-12002
fix CRM-12002
Fix ts() usage in activityView() popup.
Merge pull request #28 from mlutfy/ts-fixes

Fix ts() usage in activityView() popup.
sync with upstream master
Merge pull request #14 from dlobo/CRM-12005

Fix for CRM-12005 and CRM-12004
CRM-12010 Drupal 7 create user class doesn't support multiple creates
CRM-12008 e-Notice fixes

Conflicts:

	CRM/Utils/System/Drupal.php
Fix bad merge in civicrm_generated.mysql
Fixes for WebTest_Contribute_ContributionPageAddTest
Merge pull request #32 from davecivicrm/CRM-11534

Fixes for WebTest_Contribute_ContributionPageAddTest
Merge pull request #26 from dlobo/CRM-12007

fix CRM-12007
Merge pull request #31 from eileenmcnaughton/CRM-12008

CRM-12008 Enotice fixes on create user
Merge pull request #27 from dlobo/CRM-12002

Fix CRM-12002
fixed js error, CRM-12012