Merge remote-tracking branch 'ostrovok-team/master'

Conflicts:
	.gitignore
	emencia/admin/newsletter.py
	emencia/django/__init__.py
	emencia/django/newsletter/admin/__init__.py
	emencia/django/newsletter/urls/__init__.py
	emencia/django/newsletter/urls/newsletter.py
	emencia/forms.py
	emencia/mailer.py
	emencia/management/commands/send_newsletter.py
	emencia/models.py
	emencia/templates/newsletter/contact_import.html
	emencia/templates/newsletter/mailing_list_subscribe.html
	emencia/templates/newsletter/newsletter_historic.html
	emencia/templates/newsletter/newsletter_statistics.html
	emencia/testsettings.py
	emencia/utils/importation.py
	emencia/utils/newsletter.py
	emencia/views/mailing_list.py
	emencia/views/tracking.py
	setup.py

This was a much larger set of changes than realised, so the next few commits are likely to be some considerable debugging.