Merge branch 'master' of github.com:wangjiangb/caffe

Conflicts:
	CMakeLists.txt
Merge branch 'master' of github.com:wangjiangb/caffe