Conflicts:
	CRM/Case/Form/Activity.php
	CRM/Utils/REST.php
	sql/civicrm_generated.mysql
	xml/version.xml

CRM-12551, fixed datatable break due to tab character's

-- fix for CRM-10993

CRM-12597 - Handle changed / unknown fields in a better way

CRM-12562 Mis-named array item check in Batch.php was causing batch upda...

CRM-12563 Removed extraneous else and </table> tag. Fixed indenting thro...

CRM-12562 Mis-named array item check in Batch.php was causing batch update to set participant role profile field as is_multiple (conditional on line 204 was checking for participant_role_id instead of participant_role).

----------------------------------------
* CRM-12562: Batch Update Participant Roles Not Set, Not Checkboxes, Data Overwritten
  http://issues.civicrm.org/jira/browse/CRM-12562

----------------------------------------
* CRM-12563: Mismatched <table> tags in MembershipRenewal.tpl
  http://issues.civicrm.org/jira/browse/CRM-12563

Clarify switch between price set and manual membership (CRM-12575)

----------------------------------------
* CRM-12597: CLONE - Undefined variable: val in CRM_Contribute_BAO_Query::whereClauseSingle()
  http://issues.civicrm.org/jira/browse/CRM-12597

----------------------------------------
* CRM-12597: CLONE - Undefined variable: val in CRM_Contribute_BAO_Query::whereClauseSingle()
  http://issues.civicrm.org/jira/browse/CRM-12597

display fixes for admin console in j3

CRM-12581 - fix some notices

fix syntax error

fixed dark background for td for joomla 3.x

Minor HTML fix in Case.tpl duration field.

CRM-7964 remove Eval instances of new $string type 

api/v3/utils - Redo 16404fbb for preventing fatal error

CRM-12556 - Set admin API key for new test sites

----------------------------------------
* CRM-12556: Assign api_key for a user via command-line
  http://issues.civicrm.org/jira/browse/CRM-12556

fixed error on search

fixed regsite

----------------------------------------
* CRM-12581: Group(s) Selection for Profile Create Mode Not Saving
  http://issues.civicrm.org/jira/browse/CRM-12581

CRM-12466

CRM-12587

CRM-12571 fix

CRM-12584 GenCode shouldn't reduce memory_limit

----------------------------------------
* CRM-12587: setting group contact cache to zero results in it being set to 5
  http://issues.civicrm.org/jira/browse/CRM-12587

----------------------------------------
* CRM-12466: Group listings don't load
  http://issues.civicrm.org/jira/browse/CRM-12466