Merge pull request #3 from ZIMK/master

sync
porting to django 1.5
fix: backward compatible to django 1.4
change: django version in README [ci skip]
Merge pull request #4 from ZIMK/master

sync
merge with master
solve merge conflict
Merge pull request #14 from pgolm/django1.5

porting to django 1.5