Merge branch 4.5 into 4.6

Conflicts:
	CRM/Event/Form/ManageEvent/Conference.php

diff --cc CRM/Event/Form/ManageEvent/Conference.php
index d7739b889d5e894d62827d7ed0acf5222bc8a075,e5519306da9b69ecdb6a73b2ca3c58088d1dc884..61809e51cd905bdfec4b68f79007802e05332e2d
--- 1/CRM/Event/Form/ManageEvent/Conference.php
--- 2/CRM/Event/Form/ManageEvent/Conference.php
+++ b/CRM/Event/Form/ManageEvent/Conference.php
@@@ -45,34 -45,10 +45,8 @@@ class CRM_Event_Form_ManageEvent_Confer
    public $_action;
  
    /**
-    * Set default values for the form. For edit/view mode
-    * the default values are retrieved from the database
-    *
-    *
-    * @return void
-    */
-   public function setDefaultValues() {
-     $parentDefaults = parent::setDefaultValues();
- 
-     $eventId = $this->_id;
-     $params = array();
-     $defaults = array();
-     if (isset($eventId)) {
-       $params = array('id' => $eventId);
-     }
- 
-     CRM_Event_BAO_Event::retrieve($params, $defaults);
- 
-     $defaults = array_merge($defaults, $parentDefaults);
-     $defaults['id'] = $eventId;
- 
-     return $defaults;
-   }
- 
-   /**
-    * Build the form object.
 -   * Function to build the form
     *
     * @return void
 -   * @access public
     */
    public function buildQuickForm() {
      $slots = CRM_Core_OptionGroup::values('conference_slot');
@@@ -97,14 -72,9 +71,8 @@@
    }
  
    public function postProcess() {
--    $params = array();
      $params = $this->exportValues();
  
-     if (trim($params['parent_event_name']) === '') {
-       # believe me...
-       $params['parent_event_id'] = '';
-     }
-     //update events table
      $params['id'] = $this->_id;
      CRM_Event_BAO_Event::add($params);