Added south
Merge branch 'develop' of github.com:diegosarmentero/tvstalker into develop

Conflicts:
	tvstalker/tvstalker/settings/base.py