fix setup.py
django 1.6 compatibility
django 1.6 compatibility
merge