dfg
Merge branch 'master' of https://github.com/cizrage/rthitha

Conflicts:
	settings.pyc
	zmovies/models.pyc