0
Merge remote-tracking branch 'origin/master'

Conflicts:
	QCSE_spectrum.py
	sub/point.pyc