1,update css and js library
Merge remote-tracking branch 'origin/master'