milestone + email change
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/cluster/project/models.py