Replaced django.conf.urls.defaults by django.conf.urls to suppress warning
prevents crash when deleting user with attached avatars (fixes #52)
changed some form label names
Merge remote-tracking branch 'eureka/eureka'

Conflicts:
	avatar/forms.py
	avatar/models.py
	avatar/urls.py