Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-12-04-15-16-31

Conflicts:
	CRM/Admin/Form/Options.php
	api/v3/Contact.php
	sql/civicrm_generated.mysql

diff --cc CRM/Activity/BAO/Activity.php
Simple merge

diff --cc CRM/Admin/Form/Options.php
index ec2f9327fd20385972c9ad430905389a1c0f4f2c,87acdefb9d373488c27026f80dc209c4dd3ff307..f44c59d198766571e39e01b8a11cb9318ab2e620
--- 1/CRM/Admin/Form/Options.php
--- 2/CRM/Admin/Form/Options.php
+++ b/CRM/Admin/Form/Options.php
@@@ -270,8 -270,8 +270,19 @@@ class CRM_Admin_Form_Options extends CR
      }
  
      //fix for CRM-3552, CRM-4575
--    if (in_array($this->_gName, array(
-       'communication_style', 'email_greeting', 'postal_greeting', 'addressee', 'from_email_address', 'case_status', 'encounter_medium', 'case_type'))) {
 -      'email_greeting', 'postal_greeting', 'addressee', 'from_email_address', 'case_status', 'encounter_medium', 'case_type', 'payment_instrument'))) {
++    $showIsDefaultGroups = array(
++      'email_greeting',
++      'postal_greeting',
++      'addressee',
++      'from_email_address',
++      'case_status',
++      'encounter_medium',
++      'case_type',
++      'payment_instrument',
++      'communication_style',
++    );
++
++    if (in_array($this->_gName, $showIsDefaultGroups)) {
        $this->assign('showDefault', TRUE);
        $this->add('checkbox', 'is_default', ts('Default Option?'));
      }

diff --cc CRM/Admin/Page/Options.php
index 74395c8d5082dac08d6b81732383196b325edb91,d9ca03f03c489dcb1ad5679a21265b78337d7977..4c4667feca305a25e1e2d98eae469f775cd45fea
--- 1/CRM/Admin/Page/Options.php
--- 2/CRM/Admin/Page/Options.php
+++ b/CRM/Admin/Page/Options.php
@@@ -116,9 -116,8 +116,9 @@@ class CRM_Admin_Page_Options extends CR
          array(
            'from_email_address', 'email_greeting',
            'postal_greeting', 'addressee',
 +          'communication_style',
            'case_status', 'encounter_medium',
-           'case_type',
+           'case_type', 'payment_instrument'
          )
        )) {
        $this->assign('showIsDefault', TRUE);

diff --cc CRM/Contact/BAO/Query.php
Simple merge

diff --cc CRM/Contact/BAO/Relationship.php
Simple merge

diff --cc CRM/Core/Resources.php
Simple merge

diff --cc CRM/Event/BAO/Event.php
Simple merge

diff --cc CRM/Export/BAO/Export.php
Simple merge

diff --cc CRM/Report/Form.php
Simple merge

diff --cc install/index.php
Simple merge

diff --cc xml/templates/civicrm_data.tpl
Simple merge