updated english version
Merge branch 'master' of github.com:countcain/DeJia

Conflicts:
	DeJiaYachtClub/data/Activity.json