Merge pull request #143 from trangnt57/master

update activites page
Fix!
Enable its feature.
Fix!
Fix!
Fix!
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/views/users/show.html.erb