Added more parameters to send_mail function
Merge branch 'master' of github.com:artemrizhov/django-mail-templated

Conflicts:
	setup.py