edit activities
Merge pull request #70 from kynm/jquery

edit activities