Changes in correlation analysis
Merge remote-tracking branch 'origin/master'

Conflicts:
	correlator/templates/compare.mako
	correlator/views.py