Bug 975156 fx desktop pages

I rebased with mozilla master and added the redirects for 
[1]https://bugzilla.mozilla.org/show_bug.cgi?id=979670
[2]https://bugzilla.mozilla.org/show_bug.cgi?id=979664

If you your branch with master you'll see only 2 commits on top of yours