Merge pull request #8 from Roll20/master

update
improvements
Merge pull request #162 from alicia86/master

Grapple and attack fixes