Fix deprecated `truncate_words` in Django 1.6.
added new map
Merge remote-tracking branch 'upstream/master' into upstream
Merge branch 'upstream'

Conflicts:
	userena/contrib/umessages/models.py
	userena/contrib/umessages/urls.py
	userena/urls.py
modify urls