CRM-15316 Updating coffee mug data, deleting cost to avoid bug
Merge pull request #4149 from mepps/update-coffee-mug-premium

CRM-15316 Updating coffee mug data, deleting cost to avoid bug
CRM-15197 - fix for WebTest_Contact_AddTest::testIndividualAddWithSharedAddress

----------------------------------------
* CRM-15197:
  https://issues.civicrm.org/jira/browse/CRM-15197
Merge pull request #4153 from davecivicrm/CRM-15197g

CRM-15197 - fix for WebTest_Contact_AddTest::testIndividualAddWithShared...