update gitignore
update gitignore
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
update view
update view
merge conflict
Merge branch 'develop'
firebase auth
remove config.js ...
fixed login and update problem
fixed date
fixed date