Fixed numbers in proto and name of ArgMaxParameter
Fixed numbers in proto and name of ArgMaxParameter

Conflicts:

	src/caffe/proto/caffe.proto

gnina/gnina,gogartom/caffe-textmaps,flickr/caffe,CZCV/s-dilation-caffe,CZCV/s-dilation-caffe,longjon/caffe,flickr/caffe,gnina/gnina,gogartom/caffe-textmaps,wangg12/caffe,longjon/caffe,wangg12/caffe,gnina/gnina,gnina/gnina,gnina/gnina,tackgeun/caffe,flickr/caffe,gogartom/caffe-textmaps,gogartom/caffe-textmaps,xidianwlc/caffe,gnina/gnina,tackgeun/caffe,flickr/caffe,xidianwlc/caffe,CZCV/s-dilation-caffe,CZCV/s-dilation-caffe,orentadmor/caffe,flickr/caffe,tackgeun/caffe,xidianwlc/caffe,orentadmor/caffe,longjon/caffe,wangg12/caffe,tackgeun/caffe,orentadmor/caffe,longjon/caffe,orentadmor/caffe,wangg12/caffe,xidianwlc/caffe