Bug 948415 - Make mock_contact.py pythonic, make
insert_contact convert it to mozcontact API
friendly format. r=dhunt r=zcampbell
Bug 966865 - Update pdf.js to version 0.8.997.
Bug 942460 - [Contacts] Implement position:sticky for fixed headers r=bkelly
Bug 933542 - Added special characters to Slovak keyboard
Bug 967277 - [Contacts] Scrolling the contacts app causes reflow. Followup. r=arcturus
[B2G][Contacts] Changing phone orientation while on crop screen when adding a new contact picture distorts image
[B2G][Contacts] Changing phone orientation while on crop screen when adding a new contact picture distorts image
Bug 964927 [B2G][Contacts] Changing phone orientation while on crop screen when adding a new contact picture distorts image - merge
Bug 942199: Allow minimum EXIF preview size to be configured at build time for Camera and Gallery
(cherry picked from commit e439f8630fdea790595efaebab24ec21be6bc0e4)

Conflicts:

	apps/camera/js/filmstrip.js
Bug 968996 - Bump gaiatest to 0.21.5, r=zac
Bug 968703 - Migrate code snippet for wapppush customization from applications-data.js to apps/wappush/build/build.js
Merge pull request #16053 from vingtetun/bug967277.followup

Bug 967277 - [Contacts] Scrolling the contacts app causes reflow. Follow...
Bug 960744 - Intermittent test_calendar_new_event_appears_on_all_calendar_views.py
Merge pull request #15603 from bebef1987/fix_calendar

Bug 960744 - Intermittent test_calendar_new_event_appears_on_all_calenda...
Merge pull request #16074 from timdream/build-appdata-wappush

Bug 968703 - Migrate code snippet for wapppush customization, r=yurenju
Merge pull request #15700 from gentlefolk/948415

Bug 948415 - Make mock_contact.py pythonic, make insert_contact convert it to API-friendly format
Bug 969299 - Investigate intermittent fail in test_add_photo_to_contact.py
Merge pull request #16081 from viorelaioia/bug_969299

Bug 969299 - Investigate intermittent fail in test_add_photo_to_contact....
Merge pull request #16064 from jonallengriffin/gaiatest_version

Bug 968996 - Bump gaiatest to 0.21.5, r=zac
Bug 967662 - Recompress the PNG images added in bug 833401 r=kaze