initial commit
rename
Merge branch 'master' of github.com:GetStream/stream-django

Conflicts:
	.gitignore