CRM-13276 fix
Merge pull request #1568 from deepak-srivastava/reports

CRM-12490 - order-by fatal error fix
CRM-13314 fix - add Florida, San Jose, Rio Negro states to Uraguay

----------------------------------------
* CRM-13314: 3 Missing Geographic State for Uruguay in Address Drop Down
  http://issues.civicrm.org/jira/browse/CRM-13314
Merge pull request #1569 from monishdeb/CRM-13314

CRM-13314 fix - add Florida, San Jose, Rio Negro states to Uruguay
Merge pull request #1556 from pratik-joshi/CRM-13276

CRM-13276 fix
CRM-12490 - test fixes