Moved firebase code inside Auth look-up
Pulled from dev
Changed firebase event and snapshot
Resolved merge conflicts