dMerge branch 'master' into develop

Conflicts:
	kmeans/useless.py
just add
3 Merge branch 'develop'

Conflicts:
	kmeans/useless.py