WIP. Git sucks huge balls.
Merge branch 'master' of github.com:ska-sa/corr2

Conflicts:
	debug/connect_local.py
	scripts/corr2_servlet.py
	src/fxcorrelator.py
Merge branch 'master' of github.com:ska-sa/corr2
Merge branch 'master' of github.com:ska-sa/corr2
Merge branch 'master' of github.com:ska-sa/corr2