change refresh way
change wave animation
Merge remote-tracking branch 'origin/master'