from x1
Merge branch 'transfer' of git@github.com:wuchen0418/user-slice.git into
transfer

Conflicts:
	user-slice/src/Prediction.java
	user-slice/src/process.java