JK-29 killer barisariburnu fix
 -fixed:murdered by barisariburnu
Merge branch 'cemkiy' into develop

Conflicts:
	mailgun/views.py
 JK-29 killer barisariburnu fix
 -fixed:murdered by barisariburnu