add fb auth
Merge branch 'dev2'
a
merge
arrange html
a
merge