changed style css
Merge remote-tracking branch 'upstream/master'
change login page
fix minor bug