uniform sampling
Merge branch 'master' of https://github.com/JiangTian/deepboost

Conflicts:
	deepmaxent/deepmaxent.cpp