Transitions back
Merge pull request #17 from OlavHN/fxa_transitions

Transitions