edit activities
Merge pull request #47 from kynm/jquery

edit activities