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
[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
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
Merge pull request #16075 from gabrielesvelto/bug-967662

Bug 967662 - Recompress the PNG images added in bug 833401 r=kaze
Bug 907177 - [Clock] Add integration tests

r=gaye, mcav
Merge pull request #15928 from brendandahl/pdfjs-0.8.997

Bug 966865 - Update pdf.js to version 0.8.997.
Merge pull request #15886 from ltedone/Bug_933542-Slovak_keyboard_is_missing_the_special_characters_master

Bug 933542 - Added special characters to Slovak keyboard. r=janjongboom
Bug 964927 fixing jslint issue
Merge pull request #16062 from russnicoletti/bug964927

Bug 964927 [B2G][Contacts] Changing phone orientation while on crop screen when adding a new contact picture distorts image
Merge pull request #16063 from davidflanagan/bug942199

Bug 942199: Allow minimum EXIF preview size to be configured at build ti...
Merge pull request #14292 from KevinGrandon/bug_942460_contacts_position_sticky_headers

Bug 942460 - [Contacts] Implement position:sticky for fixed headers