update to django 1.5
Merge remote-tracking branch 'origin/master'

Conflicts:
	requirements.txt
added south to setup.py