Add relative time to activities
Merge branch 'develop' of via:/var/repository/viaduct into develop

Conflicts:
	viaduct/models/activity.py