Merge pull request #2 from gauthierm/nburka-bug-868199-unified-download

Update links as per Google Doc. FxOS link still needs to be updated more...