Added analysis resource
Added analysis resource
Merge remote-tracking branch 'origin/master'

Conflicts:
	correlator/forms.py
	correlator/tests.py
	correlator/views.py