CRM-12759 employer not being added to Multisite group
preliminary whitespace
CRM-12759 fix inconsistency in application of multisite setting
notice fix
Merge pull request #960 from kurund/notice-fixes

notice fix
CRM-12766

----------------------------------------
* CRM-12766: Upgrade html2text to version shipped by roundcube
  http://issues.civicrm.org/jira/browse/CRM-12766
CRM-12466 - Fix missing var (follow up to #927)

----------------------------------------
* CRM-12466: Group listings don't load
  http://issues.civicrm.org/jira/browse/CRM-12466
Merge pull request #963 from dlobo/CRM-12766

CRM-12766 - Unit test for html2text
Merge pull request #964 from totten/4.3-smartgroupcache-missingvar

CRM-12466 - Fix missing var
Merge pull request #948 from eileenmcnaughton/4.3

CRM-12759 - Multisite add to group code doesn't kick in when a group is being added
CRM-12733 fix : while case type is changed reset timeline to NO not respected
Merge pull request #977 from pratik-joshi/CRM-12733

Crm 12733
Create parent for parser classes CRM-11254

----------------------------------------
* CRM-11254: Create parent class for import
  http://issues.civicrm.org/jira/browse/CRM-11254
Update calls to class constants CRM-11254

----------------------------------------
* CRM-11254: Create parent class for import
  http://issues.civicrm.org/jira/browse/CRM-11254
Move redundant parser code into parent CRM-11254

----------------------------------------
* CRM-11254: Create parent class for import
  http://issues.civicrm.org/jira/browse/CRM-11254
Create parent for Import/Form/Summary CRM-11254

----------------------------------------
* CRM-11254: Create parent class for import
  http://issues.civicrm.org/jira/browse/CRM-11254
Merge stateMachine into one file CRM-11254

----------------------------------------
* CRM-11254: Create parent class for import
  http://issues.civicrm.org/jira/browse/CRM-11254
Standardize on name DataSource instead of UploadFile CRM-11254

----------------------------------------
* CRM-11254: Create parent class for import
  http://issues.civicrm.org/jira/browse/CRM-11254
Create parent for Import/Form/Preview CRM-11254

----------------------------------------
* CRM-11254: Create parent class for import
  http://issues.civicrm.org/jira/browse/CRM-11254
Create parent for Import/Form/MapField CRM-11254

----------------------------------------
* CRM-11254: Create parent class for import
  http://issues.civicrm.org/jira/browse/CRM-11254