Merge branch 'master' of https://github.com/QiuXiang/cnsoft

Conflicts:
	.idea/workspace.xml
	src/client/rserve/Clustering.java
	src/client/rserve/ConRserve.java
	src/client/rserve/KMeansClustering.java