Merge remote-tracking branch 'refs/remotes/last_proj/master'

Conflicts:
	stories/models.py