Adding activities functions
Merge remote-tracking branch 'origin/master'

Conflicts:
	bixplorer/__init__.pyc
	bixplorer/settings.pyc
	bixplorer/urls.pyc
	bixplorer/wsgi.pyc
	home/__init__.pyc
	home/admin.pyc
	home/migrations/__init__.pyc
	home/models.pyc
	home/urls.pyc
	home/views.pyc
	projects/__init__.pyc
	projects/admin.pyc
	projects/migrations/0001_initial.pyc
	projects/migrations/__init__.pyc
	projects/models.pyc
	projects/urls.pyc
	projects/views.pyc
	registration/__init__.pyc
	registration/admin.pyc
	registration/auth_urls.pyc
	registration/backends/__init__.pyc
	registration/backends/simple/__init__.pyc
	registration/backends/simple/urls.pyc
	registration/backends/simple/views.pyc
	registration/forms.pyc
	registration/migrations/0001_initial.pyc
	registration/migrations/__init__.pyc
	registration/models.pyc
	registration/signals.pyc
	registration/users.pyc
	registration/views.pyc
	userprofile/__init__.pyc
	userprofile/admin.pyc
	userprofile/migrations/0001_initial.pyc
	userprofile/migrations/__init__.pyc
	userprofile/models.pyc
	userprofile/views.pyc