source selecting
Merge branch 'master' of github.com-martin:martinthenext/criticalsyncing

Conflicts:
	criticalsyncing/core/views.py