Bug 941563 - [v1.2] Re-enable test_cards_view_kill_app_with_three_apps.py
Merge pull request #13874 from jmcanterafonseca/fb_favs_link_img

Bug 937205 - [B2G][Contacts] Contact picture does not display after Link...
(cherry picked from commit f55c9746b9ae4a1aab739d6015ebff3cf51d21f3)

Conflicts:
	apps/communications/contacts/js/fb_resolver.js
Merge pull request #13899 from AndreiH/bug941563

Bug 941563 - [v1.2] Re-enable test_cards_view_kill_app_with_three_apps.p...