DO NOT MERGE patch for CRM-12840 by Jamie McClelland
CRM-13257 fixes for hard-coded relationship type for Employee and Household Member.

----------------------------------------
* CRM-13257: Hard-coded relationship type for employer-employee relationship causing Current Employer checkbox to be hidden AND invalid sample data
  http://issues.civicrm.org/jira/browse/CRM-13257
Add webtest for creating a Current Employer and checking view relationship to make sure field is present and set.
Merge pull request #1493 from davecivicrm/CRM-13257

Crm 13257 Fixes for hard-coded relationship type for Employee and Household, including new web test.
CRM-13282, fixed state default for membership billing block and code cleanup for offline event registration via CC

----------------------------------------
* CRM-13282: Prefill billing address on back-office contribution via credit card and membership via credit card using profile.get api
  http://issues.civicrm.org/jira/browse/CRM-13282
more fixes for CRM-13212
CRM-13263
CRM-13026-handling-of-showing-scheduled-recipients-as-well, also added a new filter for mailing job status
CRM-13209, image url should not be required if already set

----------------------------------------
* CRM-13209: Mandatory custom fields, on edit, always require a new upload (regression)
  http://issues.civicrm.org/jira/browse/CRM-13209
CRM-13294 support for api style array of ids as a param for contact_get
Add test for exising is_deceased behaviour on contact.get
CRM-13294 tweaks to comments & code readability
CRM-13294 test to see if membership.get accepts arrays for 'id' (it does - not changes made
Merge pull request #1524 from totten/master-contactget-in

CRM-13294 - Support for array style input on id for contact.get (resubmit)
api_v3_MessageTemplatesTest - Fix regression

Note that the test called createTestObject() (once in setup(), once in the
testGet()) but expected only one object to get created.  This doesn't make
sense to me -- sounds more like a bug.
Add config setting to disable mandatory tokens check in mailings

As per a previous discussion (with Lobo IIRC), add a configuration
setting to disable the check for presence of mandatory tokens when
sending mailings.

This setting is implemented as a negative option, i.e. ticking the
option disables the check. We could also reverse the logic, so that
ticking the option enables the check instead; and set it to on by
default... Not sure which is preferable -- I guess that's mostly a
matter of taste.
Merge pull request #1505 from sfe-ev/disable_mandatory_tokens

Add config setting to disable mandatory tokens check in mailings
CRM-13294 fix membership to support IN format on contact_id

Conflicts:

	tests/phpunit/api/v3/MembershipTest.php
test fix on api_v3_ContributionTest.testCompleteTransaction api_v3_ContributionTest.testCompleteTransaction
Merge pull request #1526 from eileenmcnaughton/master

CRM-13294 - extra fix + test fix