minor
Merge branch 'master' of ssh://demo.engament.com/var/www/engament

Conflicts:
	core/management/commands/trigger.py