Merge branch 'master' of https://github.com/suyuxin/rapmf

sync with server and local machine
Merge branch 'master' of https://github.com/suyuxin/rapmf
fixed
Conflicts:
	result2/best_minibatch.txt