-- added form rule for CRM-12233
check number of terms when updating member payment status
Merge branch 'master' of git://github.com/civicrm/civicrm-core into CRM-12233
-- code improvement for CRM-12233
-- added comments CRM-12233
worked on CRM-12238, do not set localized defaults for country, state and county for advanced search
Merge pull request #304 from pradpnayak/CRM-12233

-- added form rule for CRM-12233
worked on CRM-12238, fixed fatal when search contacts after selecting only state and not country
Merge pull request #310 from agh1/paylater-multiterm

check number of terms when updating member payment status
CRM-12268 Also fixing minor layout problem for price set calculated totals on public pages, and add missing space in Membership form status msg.

----------------------------------------
* CRM-12268: Completing a pay-later ignores the membership number of terms
  http://issues.civicrm.org/jira/browse/CRM-12268
Merge pull request #318 from davecivicrm/CRM-12268

CRM-12268 Also fixing minor layout problem for price set calculated tota...
Fix setting defaults for event form CRM-12149
Merge pull request #317 from kurund/CRM-12238

CRM-12238
CRM-12266
Fix required payment fields CRM-12149
Merge pull request #319 from yashodha/CRM-12266

CRM-12266
Code cleanup and php strict fix
CRM-12277 Add info to Batch status change message to let users now that notifications will be sent for Pending Pay Later to Attended or Registered updates.

----------------------------------------
* CRM-12277: Notify batch Change Participant Status users that changing status FROM Pay Later TO Attended or Registered triggers email notification and payment status update
  http://issues.civicrm.org/jira/browse/CRM-12277
Remember payment processor when user clicks the back button CRM-12149
Merge pull request #320 from colemanw/event-snippet

These changes fixed the default setting issue and erroneous form rule invocation.