Made activities json serializable
Merge branch 'master' of https://github.com/allygale/Activites