fixed problems with django 1.6
updated version and fixed django version
Merge pull request #99 from shomodj/master

fixed problems with django 1.6