updated requirements
Merge branch 'master' into django1.5

Conflicts:
	setup.py