Added Django 1.7 support
Added Django 1.7 support
Merge commit '50ca1b2828d1af1914b9ec183cbe0cfddcb94076'

* commit '50ca1b2828d1af1914b9ec183cbe0cfddcb94076':
  Added Django 1.7 support
  Added Django 1.7 support