note the last added layer/params in caffe.proto to prevent conflicts
note the last added layer/params in caffe.proto to prevent conflicts

The current scheme does not actually prevent conflicts, since three-way
merge will accept simultaneous changes that agree on the next number.
This commit fixes this by explicitly noting the last layer added.

nicodjimenez/caffe,vibhav-vineet/caffe,nicodjimenez/caffe,naeluh/caffe,shiquanwang/caffe,liuxianming/caffe_feedback,shuimulinxi/caffe,shuimulinxi/caffe,gnina/gnina,bharath272/sds_eccv2014,xidianwlc/caffe,shiquanwang/caffe,minghuam/caffe,dculibrk/boosted_pooling,yikeliu/caffe-future,Hilovaiserillis/caffe,niuzhiheng/caffe,dylansun/caffe,gnina/gnina,longjon/caffe,dylansun/caffe,yikeliu/caffe-future,tackgeun/caffe,minghuam/caffe,MoskalenkoViktor/caffe,gogartom/caffe-textmaps,liuxianming/caffe_feedback,xidianwlc/caffe,liuxianming/caffe_feedback,naeluh/caffe,MoskalenkoViktor/caffe,pcoving/caffe,nicodjimenez/caffe,CZCV/s-dilation-caffe,naeluh/caffe,niuzhiheng/caffe,dylansun/caffe,shiquanwang/caffe,MoskalenkoViktor/caffe,flickr/caffe,niuzhiheng/caffe,shiquanwang/caffe,gogartom/caffe-textmaps,sichenucsd/caffe_si,audtlr24/caffe,Hilovaiserillis/caffe,pcoving/caffe,dculibrk/boosted_pooling,tackgeun/caffe,shuimulinxi/caffe,dculibrk/boosted_pooling,vibhav-vineet/caffe,gnina/gnina,xidianwlc/caffe,sichenucsd/caffe_si,longjon/caffe,Hilovaiserillis/caffe,orentadmor/caffe,yikeliu/caffe-future,flickr/caffe,suixudongi8/caffe,CZCV/s-dilation-caffe,pcoving/caffe,MoskalenkoViktor/caffe,tackgeun/caffe,orentadmor/caffe,orentadmor/caffe,niuzhiheng/caffe,gnina/gnina,MoskalenkoViktor/caffe,xidianwlc/caffe,Hilovaiserillis/caffe,liuxianming/caffe_feedback,niuzhiheng/caffe,audtlr24/caffe,dylansun/caffe,shuimulinxi/caffe,wangg12/caffe,wangg12/caffe,vibhav-vineet/caffe,flickr/caffe,flickr/caffe,minghuam/caffe,gnina/gnina,CVML/sds_eccv2014,wangg12/caffe,longjon/caffe,dylansun/caffe,CZCV/s-dilation-caffe,Hilovaiserillis/caffe,nicodjimenez/caffe,gogartom/caffe-textmaps,sichenucsd/caffe_si,naeluh/caffe,orentadmor/caffe,minghuam/caffe,shuimulinxi/caffe,vibhav-vineet/caffe,pcoving/caffe,nicodjimenez/caffe,liuxianming/caffe_feedback,suixudongi8/caffe,yikeliu/caffe-future,gogartom/caffe-textmaps,longjon/caffe,audtlr24/caffe,audtlr24/caffe,pcoving/caffe,audtlr24/caffe,suixudongi8/caffe,flickr/caffe,dculibrk/boosted_pooling,dculibrk/boosted_pooling,wangg12/caffe,CZCV/s-dilation-caffe,gnina/gnina,sichenucsd/caffe_si,naeluh/caffe,suixudongi8/caffe,tackgeun/caffe