Updates for Firebase Simple Login updates
Merge branch 'simple-login-updates'

Conflicts:
	www/js/firefeed.js