Deferred use to jquery animation
Merge remote-tracking branch 'origin/master'