Merge Fxa branch into master branch

FXA is now in production. We can delete the fxa branch and leave only the master one.
I merged FXA into Master locally in my repo and resolved merged conflicts.