add nms
Merge branch 'spp-boost' into lsda-demo

Conflicts:
	src/caffe/layers/nms_layer.cpp
remove temp files
Merge branch 'spp-boost' into lsda-demo