pre merge commit
Merge branch 'newRefine' of github.com:minillinim/GroopM into newRefine

Conflicts:
	groopm/cluster.py
	groopm/refine.py