#74 - new 40x40 icon replacement for photo edit function.
fixed #97 [Video] let video Controler bar follow spec
Merge pull request #110 from mpizza/video_controler

fixed #97 [Video] let video Controler bar follow spec
fixed #115 [Gallery] swap share icon and delete icon position
Merge pull request #117 from mpizza/swap_icons

fixed #115 [Gallery] swap share icon and delete icon position
fixed #116 change music player background color
Merge pull request #120 from mpizza/change_bg_color

fixed #116 change music player background color
Bug 860318 - Update keyboard visuals to improve performance.
   1. Fix the issue that Keyboard layout name will be all capitalized.
   2. Fix the isuse that the key order in alternative char menu (right-hand side) is not reversed.
   3. Update the visual design
   4. Do the responsive design in JS
r=timdream
(cherry picked from commit 56c24eac2ee5f749126a07606ab9ec8e8d3a4638)

Conflicts:
	apps/keyboard/style/keyboard.css
Merge pull request #122 from RudyLu/device/keyboard_tweak

Bug 860318 - Update keyboard visuals to improve performance.
Issue # 87 - [System] Polish card view for specified resolution
Bug 872588 - Make mozSettings works again with the browser-helper extension. r=ochameau
(cherry picked from commit 68a0d752be643a2a86e420239b77236b4c2195a8)
Issue 31 - Display a pop-up menu when bookmark icon is clicked.
Merge pull request #121 from rexboy7/local-issue87

Issue #87 - [System] Polish card view for specified resolution
Merge pull request #71 from evanxd/gaia-local-issue-31-4

Issue 31 - Display a pop-up menu when bookmark icon is clicked.
Issue#19 - Adjust key size and layout on a bigger screen.
Merge pull request #123 from evanxd/gaia-local-issue-19-3

Issue #19 - [Keyboard] Adjust key size and layout on a bigger screen.
Merge branch 'master' of github.com:gaia-local/gaia into gaia-local/issue-100
issue 100, Part#2