Merge branch 'indirection_layer' of https://github.com/netheril96/caffe into dev_pr_1380_multilabel_INPROGRESS

Conflicts:
	include/caffe/util/indexed_data.hpp
	src/caffe/proto/caffe.proto