added scantype scan1d
Merge branch 'master' of https://github.com/carichte/pyrexs

Conflicts:
	evaluationtools/scantype.py