merge
Merge branch 'master' of https://github.com/derHahn/SBtab

Conflicts:
	SBtabTools.py