snyc
Merge remote-tracking branch 'origin/master'

Conflicts:
	bixplorer/urls.pyc
	home/urls.pyc
	home/views.pyc
	projects/urls.pyc
	projects/views.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/signals.pyc
	registration/views.pyc
	userprofile/views.pyc