Bug 942460 - [Contacts] Implement position:sticky for fixed headers r=bkelly
[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 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
Merge branch 'master' of https://github.com/mozilla-b2g/gaia into achaturv