Merge pull request #4205 from NileemaJadhav/CRM_HR_45_test

--HR-379 Fix notices coming while importing relationship details
Webtest fix
INFRA-124 - tools/scripts/phpunit - Add error check

The goal is to eventually switch from the embedded phpunit
("civicrm/packages/PHPUnit") to a more standard/standalone copy.  Howeer,
this requires a different CLI (e.g.  "./scripts/phpunit CRM_Foo_BarTest" vs
"phpunit tests/phpunit/CRM/Foo/BarTest.php").

When we make the switch, we'll need some kind of transition for developers
who use the old CLI. This commit provides them with a better error message.

Note: It's tempting to automatically call the standalone phpunit rather than
printing an error; however, there are edge-cases (like unit-tests for
extensions) to consider, and (for now) it's easier to just throw an error
rather than try to think through each of them.
Webtest failure fix
CRM-15350 fix - Membership Batch Entry doesn't support soft credit type and soft credit js break on both Batch entry

https://issues.civicrm.org/jira/browse/CRM-15350
Merge pull request #4213 from rohankatkar/webtest_4.5.0

Webtest failure fix
Merge pull request #4212 from jitendrapurohit/webtestfixes

Webtest fix
Webtest fix in CiviMailUtils.php
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-09-24-01-37-53
backport financial account and financial type api
add Activity Contact api to backport
additional example
additional example
CRM-15363 - Make jcalendar.tpl more resilient to duplicate dom ids
Merge pull request #4217 from colemanw/CRM-15363

CRM-15363 - Make jcalendar.tpl more resilient to duplicate dom ids
CRM-14978 related cleanup
Do not merge to 4.5 - fixes to make backported api pass tests,
one merged into 4.4 I'll do a merge PR to 4.5 to ensure this isn't merged as the fixes involve skipping tests due to upstream test framework changes
not being in 4.4
DO NOT MERGE - temp test fix for 4.4
I will merge once in 4.4
Merge pull request #3759 from eileenmcnaughton/api

backport financial account and financial type api & activity_contact api
Merge branch '4.4' of https://github.com/civicrm/civicrm-core into 4.5

Conflicts:
	CRM/Core/DAO.php
	CRM/Financial/BAO/FinancialAccount.php
	CRM/Financial/BAO/FinancialType.php
	tests/phpunit/api/v3/CaseTest.php
	tests/phpunit/api/v3/SyntaxConformanceTest.php