CRM-13876 - Fixed membership end date calculation should use start date, not join date.

----------------------------------------
* CRM-13876:
  http://issues.civicrm.org/jira/browse/CRM-13876
Merge pull request #2028 from davecivicrm/CRM-13786

CRM-13876 - Fixed membership end date calculation should use start date,...
fixed regression in CRM-11301, due to changes in 4.4

----------------------------------------
* CRM-11301: Add / Edit Activity: create new contact option for With contact (target) field
  http://issues.civicrm.org/jira/browse/CRM-11301
Merge pull request #2029 from kurund/CRM-11301

fixed regression in CRM-11301, due to changes in 4.4
CRM-13780 fix - Don't allow users to attempt to merge  the Default Organization into another organization

http://issues.civicrm.org/jira/browse/CRM-13780
Remove html formatting from status message
-- CRM-13627 modification for sort object in getrows function

----------------------------------------
* CRM-13627: AJAX filtering for profile listings
  http://issues.civicrm.org/jira/browse/CRM-13627
Merge pull request #2030 from monishdeb/CRM-13780

CRM-13780 fix - Don't allow users to attempt to merge the Default Organization into another organization
CRM-13780 - rework error message

----------------------------------------
* CRM-13780: Don't allow users to attempt to merge  the Default Organization into another organization
  http://issues.civicrm.org/jira/browse/CRM-13780
Merge pull request #2034 from dlobo/CRM-13780

CRM-13780 - rework error message
Merge pull request #2031 from dakshayani/CRM-13627

-- CRM-13627 modification for sort object in getrows function
CRM-13793 - fix bad assignment

----------------------------------------
* CRM-13793: Miscellaneous code cleanups
  http://issues.civicrm.org/jira/browse/CRM-13793
Merge pull request #2035 from dlobo/CRM-13793

CRM-13793 - fix bad assignment
Temporary solution to people being able to see too much information on membership dashboard
Add Batch metadata
CRM-13737 drupal userSystem class fix formatResourceURL function to use class inheritance rather than a static functii
ion

----------------------------------------
* CRM-13737: Restrucure drupal folder out of the civicrm folder
  http://issues.civicrm.org/jira/browse/CRM-13737
CRM-13737 allow drupal folder to be at the same level as the civicrm folder

----------------------------------------
* CRM-13737: Restrucure drupal folder out of the civicrm folder
  http://issues.civicrm.org/jira/browse/CRM-13737

CRM-13737 tidy up previous commit

----------------------------------------
* CRM-13737: Restrucure drupal folder out of the civicrm folder
  http://issues.civicrm.org/jira/browse/CRM-13737
CRM-13737 drupal integration - Use basename fn to extract last dir in the url as suggested by @totten
CRM-13737 drupal integration - remove directory handling from non civi urls

& add code comments to attempt to explain what is going on :-)
CRM-13737 drupal integration - opps - fix double negative that snuck in