Merge branch 'master' into development

Conflicts:
	src/main/java/com/examples/ExampleKMeans.java
	src/main/java/com/textclustering/kmeans/KMeans.java