Remove gift section animation
Merge branch 'master' of https://github.com/AriusLee/spark
Fix header behaviour
Fix conflict