MoreClustering

MoreClustering
Merge branch 'master' of https://github.com/Phragmite/COLink

Conflicts:
	src/main/java/org/colink/controller/HomepageController.java