CRM-12874

----------------------------------------
* CRM-12874: Move civicrm.settings.php.tpl so it isn't in the same place as Smarty templates
  http://issues.civicrm.org/jira/browse/CRM-12874
CRM-12874

----------------------------------------
* CRM-12874: Rename civicrm.settings.php.tpl so it uses a different suffix from Smarty templates
  http://issues.civicrm.org/jira/browse/CRM-12874
Merge pull request #44 from dlobo/CRM-12874

CRM-12874
CiviCRM Case / Views integration
CiviCRM Case / Views integration
Merge pull request #45 from mcleinn/7.x-master

CRM-12853 Case/Views integration
CRM-12853 related fix, Pseudoconstant filter issue for Drupal Views3

----------------------------------------
* CRM-12853: Patch for CiviCase + Drupal Views3 integration
  http://issues.civicrm.org/jira/browse/CRM-12853
Merge pull request #46 from monishdeb/CRM-12853

CRM-12853 related fix, Pseudoconstant filter issue for Drupal Views3
fixed CRM-13171

----------------------------------------
* CRM-13171: Adding property_type to the civicrm_contact_ref_contact info.
  http://issues.civicrm.org/jira/browse/CRM-13171
fixed CRM-13171

----------------------------------------
* CRM-13171: Adding property_type to the civicrm_contact_ref_contact info.
  http://issues.civicrm.org/jira/browse/CRM-13171
Merge pull request #47 from kurund/CRM-13171

CRM-13171