commit
commit
commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	dataminning/src/main/java/com/easyminning/tag/StepTagSimilarity.java
commit