modified:   include/caffe/loss_layers.hpp
	modified:   src/caffe/layer_factory.cpp
	modified:   src/caffe/proto/caffe.proto
Merge branch '1v1svm' of https://github.com/dennis910130/caffe into 1v1svm
	new file:   src/caffe/layers/1v1accuracy_layer.cpp