nav bar collapse 안되게 / login button size
Merge remote-tracking branch 'origin/develop_sj' into develop