Lot of js and css added for sign in/out/up
fix conflict merge