take into account the current_employer pseudo field
Merge pull request #2187 from tttp/CRM-13949-current-employer

CRM-13949 take into account the current_employer pseudo field in api.contact.get
CRM-13948

Hook alter mail params needs more info (id)
CRM-13954 processGreetings contact object query condition
CRM-13957 - import - undefined index when mapping fields

----------------------------------------
* CRM-13957: 2nd page of Import script reports undefined index
  http://issues.civicrm.org/jira/browse/CRM-13957
CRM-13957 - import - avoid non-object error

----------------------------------------
* CRM-13957: 2nd page of Import script reports undefined index
  http://issues.civicrm.org/jira/browse/CRM-13957
CRM-13960 - import - ensure empty fields don't throw validation errors

----------------------------------------
* CRM-13960: importing an empty custom data value for bolean type results in validation error
  http://issues.civicrm.org/jira/browse/CRM-13960
Merge pull request #2201 from jmcclelland/import-empty-custom-boolean

CRM-13960 - import - ensure empty fields don't throw validation errors
Merge pull request #2198 from jmcclelland/undefined-index-import

CRM-13957 - import - undefined index when mapping fields
Merge pull request #2194 from eileenmcnaughton/CRM-13948

CRM-13948 Hook alter mail params needs more info (id)
CRM-13926 : FIX
Merge pull request #2205 from pratik-joshi/CRM-13926

CRM-13926 : fix
Merge pull request #2196 from lcdservices/CRM-13954

CRM-13954 processGreetings contact object query condition