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 :-)
Extra tests to check behaviour when setting current employer on existing relationships
Merge branch 'CRM-12023' of github.com:eileenmcnaughton/civicrm-core into 4.4