test merge local
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/main/java/com/ccnt/cado/algorithm/data/DataFetcher.java
test merge
test confilict solution
test conflict solution