Activity name
Merge branch 'master' of github.com:robsmall/the-hub-backend

Conflicts:
	models.pyc