working on animation
docpad version update
Merge branch 'master' into dev
working on animation
merged
Merge branch 'master' into dev