[#61159076] change api_key to the default (in CRM)
[#61159076] Typo (there's a method named merge)
[#61159076] if state is pending merge controller must return 202
[#61159076] Check if the Merge already exists
[#61159076] Stub activity stream merge

Now that we give a 202 response when merge is pending we need to really
merge the contacts
[#61159076] Add uniqueness validation
[#62972252] updated avatar and attachment controller to use kshema_id when requested
[#63666158] ignore duplicate kshema_id
Merge remote-tracking branch 'origin/master' into 61159076-merge-properly-working

Conflicts:
	lib/crm_merge.rb
add crm_key to travis environment
Merge remote-tracking branch 'origin/63666158-ignore-duplicate-kshema-id'
[#6388786] create observation model and specs as a local unique attribute for contact
Merge remote-tracking branch 'origin/master' into 63887836-kshema-observations-as-lua
[#63887836] change spec description and file name
log errors when creating import
[#64118404] status should be preserved
[#64118404] set local status
attachments can now have ANY extension
verbose import
in staging log to stdout and debug level