fixed issue on remove activity and localization
Merge branch 'master' of https://github.com/acemtp/website

Conflicts:
	client/views/members/memberDetail.html
localization
Merge branch 'master' of https://github.com/acemtp/website