Merge pull request #20812 from anefzaoui/bug-1022429

Bug 1022429 - [Homescreen] Flatter design for notification tray.
Merge pull request #20498 from Rik/csslint-in-travis

Bug 1024993 -  Run the CSS Linter in Travis/TBPL r=vingtetun
Merge pull request #20881 from crdlc/bug-1028817-v2

Bug 1028817 - [Collection app] Wrong box shadow in edit mode
Merge pull request #20505 from jimporter/ringtones-icons

Bug 1020588 - [ringtones] Update the ringtone app's icon
Bug 1017333 - Clear notifications when we open the call log

Also don't clear notifications when we reopen the dialer app on another tab
Revert "Merge pull request #20532 from timdream/keyboard-modify-layout" for most likely causing a really frequent gaia-ui test failure

This reverts commit a6c97a8924e9649052e7e33878ae4d28441975fd, reversing
changes made to 2d50292b3f4f8adce0680a9cd2df76f339f55ff3.
Revert "Bug 1024993 - Update CSS xfail list to be green"

This reverts commit dade090fc3299af85a19b5930d4720c203c3e43e.
Revert "Bug 1024993 -  Run the CSS Linter in Travis/TBPL"

This reverts commit 6afc2da504ecccd4c0906a2f7fed962b0163535b.
Bug 1021481 - Handle app protocol for DEBUG=1 mode, with port change
Bug 1022984 / Bug 1027536 - After Restarting Phone, Lockscreen Time Always Shows as 5:32 or Is Stalled
Merge pull request #20648 from mnjul/bug_1024845_lockscreen_asset_swap

Bug 1024845 - Lockscreen Visual Refresh follow-up: Assets Swap. r=gweng
Merge pull request #20274 from EragonJ/bug-968619

Bug 968619 - [Settings] add marionette test for airplane mode
Bug 996479 - {{browserBrandShortName}} is displayed instead of Firefox OS (browser, FTU)
Bug 1029201 - Large app icons are 284px, not 289px; r=kgrandon

This commit was generated by running the following shell commands to move all the files to the proper locations:

  find apps -name "*_289.png" -exec sh -c 'FILE=`echo {} | sed -e "s/289/284/"`; git mv {} $FILE' \;
  find shared -name "*_289.png" -exec sh -c 'FILE=`echo {} | sed -e "s/289/284/"`; git mv {} $FILE' \;
  ln -fs apps/wallpaper/style/icons/wallpaper_284.png apps/homescreen/everything.me/images/wallpaper_284.png
  find apps -name "manifest.webapp" -exec sed -i 's/289/284/g' {} \;

Plus manually editing one instance in apps/browser/index.html
Bug 963463 - Employ easier logic for determining external apps
Bug 1022427 - Use localized event for appWindow broadcasting
Merge pull request #20654 from shamenchens/Bug1021481-App-Protocol-3

Bug 1021481 - Handle app:// protocol for DEBUG=1, r=ochameau
Bug 1028069 - Remove Scheme and Port in build system
Bug 1022880 - [Camera] Add focus state color to the continuous auto focus ring
Bug 995291 -[CostControl] Add unit test