updated js
merged (commented out my side of conflict
added activities, fixed details
Merge branch 'master' of https://github.com/sagunagoel/leggo
changes trans message