Integrated Firebase
Merge with master