Adding bio field on user profile
updating translations
Merge branch 'master' into bio_field_on_userprofile
Merge branch 'master' into bio_field_on_userprofile
Adding identi_ca field to user
Adding identi.ca and bio field to be displayed on user profile
Merge pull request #138 from TracyWebTech/bio_field_on_userprofile

Bio and identi_ca field on userprofile - closes #117 and #90
Changing biography to bio
Merge branch 'master' into replacing_charts

Conflicts:
	src/locale/pt_BR/LC_MESSAGES/django.mo
	src/locale/pt_BR/LC_MESSAGES/django.po