Merge branch 4.6 into master

Conflicts:
	CRM/Member/BAO/Query.php
	sql/civicrm_generated.mysql
	xml/version.xml

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

diff --cc CRM/Contribute/Form/Task/Invoice.php
Simple merge

diff --cc CRM/Member/BAO/MembershipStatus.php
Simple merge

diff --cc CRM/Member/BAO/Query.php
index dabf18fb128116f19e1e973a9eead6572a792931,0fff4dc3cb54423534ed61f8d30e3c4843894173..3941b03f79e68921096951babdf8c7fa8da66054
--- 1/CRM/Member/BAO/Query.php
--- 2/CRM/Member/BAO/Query.php
+++ b/CRM/Member/BAO/Query.php
@@@ -418,19 -396,14 +418,19 @@@ class CRM_Member_BAO_Query 
     * @param CRM_Core_Form $form
     */
    public static function buildSearchForm(&$form) {
-     $membershipStatus = CRM_Member_PseudoConstant::membershipStatus();
+     $membershipStatus = CRM_Member_PseudoConstant::membershipStatus(NULL, NULL, 'label', FALSE, FALSE);
 -    $form->add('select', 'membership_status_id', ts('Membership Status(s)'), $membershipStatus, FALSE,
 -      array('id' => 'membership_status_id', 'multiple' => 'multiple', 'class' => 'crm-select2')
 -    );
 -
 -    $form->addSelect('membership_type_id',
 -      array('entity' => 'membership', 'multiple' => 'multiple', 'label' => ts('Membership Type(s)'), 'option_url' => NULL, 'placeholder' => ts('- any -'))
 -    );
 +    $form->add('select', 'membership_status_id', ts('Membership Status(s)'), $membershipStatus, FALSE, array(
 +      'id' => 'membership_status_id',
 +      'multiple' => 'multiple',
 +      'class' => 'crm-select2',
 +    ));
 +
 +    $form->addEntityRef('membership_type_id', ts('Membership Type(s)'), array(
 +      'entity' => 'MembershipType',
 +      'multiple' => TRUE,
 +      'placeholder' => ts('- any -'),
 +      'select' => array('minimumInputLength' => 0),
 +    ));
  
      $form->addElement('text', 'member_source', ts('Source'));
  

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

diff --cc templates/CRM/Custom/Page/Option.tpl
Simple merge