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.
Merge pull request #1465 from colemanw/CRM-12840

DO NOT MERGE patch for CRM-12840 by Jamie McClelland
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-08-28-20-20-34

Conflicts:
	sql/civicrm_generated.mysql
	tests/phpunit/WebTest/Contact/RelationshipAddTest.php