Merge commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	correlator/resources.py
	correlator/views.py