checkpoint
Merge branch 'master' of github.com:paulovillani/camprulho

Conflicts:
	portal/templates/profile_activity.html