modified:   src/caffe/layers/nms_layer.cpp
	modified:   src/caffe/proto/caffe.proto