CRM-13677 civicrmtheme clean query off url string before deciding if it is public or not
Merge pull request #83 from eileenmcnaughton/7.x-4.4

CRM-13677 civicrmtheme clean query off url string before deciding if it ...
CRM-13694 - Check if CIVICRM_SETTINGS_PATH already defined
Merge pull request #86 from colemanw/7.x-4.4

CRM-13694 - Check if CIVICRM_SETTINGS_PATH already defined
Merge remote-tracking branch 'upstream/7.x-4.4' into 7.x-4.4-7.x-master-2013-11-11-10-55-55