deleted:    Makefile.config.example
	modified:   examples/imagenet/imagenet_solver.prototxt
	modified:   examples/imagenet/imagenet_train.prototxt
	modified:   examples/imagenet/imagenet_val.prototxt
	modified:   examples/imagenet/make_imagenet_mean.sh
	modified:   examples/imagenet/train_imagenet.sh
	modified:   python/caffe/classifier.py
	modified:   python/caffe/io.py
Merge branch 'dev' of https://github.com/BVLC/caffe into dev
	new file:   CNN_features.py