Fixed reference to register view in login template.
Adjust auth to newest versions of djang-social-auth where USERNAME value is dropped and we should use string directly
URL configuration for password resetting.
Put the july apps at the top of INSTALLED_APPS to make sure our own
templates are loaded first.
New templates for password resetting.
smtp configuration is now needed to test email functionality.
Initial work on badges suppor
Added simple badges view
Merge pull request #59 from kkszysiu/badges

Badges - models, templates and views.
Merge pull request #55 from kkszysiu/django_social_auth_adjust_username

Adjust auth to newest versions of django-social-auth...
Merge pull request #57 from romanlevin/password-reset

Password reset by email
Merge branch 'master' into verify-users

* master:
  Added simple badges view
  Initial work on badges suppor
  smtp configuration is now needed to test email functionality.
  New templates for password resetting.
  URL configuration for password resetting. Put the july apps at the top of INSTALLED_APPS to make sure our own templates are loaded first.
  Adjust auth to newest versions of djang-social-auth where USERNAME value is dropped and we should use string directly
  Fixed reference to register view in login template.

Conflicts:
	july/urls.py
Email verification implemented taking into account social_auth.