Done small change
done new face book login butt
resolve conflict