Merged contacts app from Alfie into users

deploy/pip_packages.txt

django/website/mail/__init__.py

django/website/mail/models.py

django/website/mail/tests/notify_test.py

django/website/mail/tests/test_email_template.html

django/website/settings.py

django/website/users/admin.py

django/website/users/auth_urls.py

django/website/users/countries.py

django/website/users/forms.py

django/website/users/group_permissions.py

django/website/users/management/__init__.py

django/website/users/management/commands/__init__.py

...site/users/management/commands/setup_group_permissions.py

django/website/users/migrations/0002_auto_20150820_1634.py

django/website/users/models.py

django/website/users/tables.py

django/website/users/templates/contacts/delete_contact.html

django/website/users/templates/contacts/edit_contact.html

...ebsite/users/templates/contacts/edit_student_contact.html