Give back to layer what is layer's, and to factory what is factory's#1270

Yangqing merged 1 commit intoBVLC:devBVLC/caffe:devfrom

Yangqing:devYangqing/caffe:devCopy head branch name to clipboard