Merge remote-tracking branch 'remotes/origin/dev'

Conflicts:
	.gitignore
	pyback/settings.py
	pyback/urls.py
	requirements.txt