fixed some bug of memory, makefile for matcaffe
add device No. to solver.prototxt
	修改：      Makefile
	修改：      examples/cifar10/cifar10_quick_solver.prototxt
	修改：      examples/cifar10/cifar10_quick_solver_lr1.prototxt
	修改：      examples/cifar10/convert_cifar_data.cpp
	修改：      examples/imagenet/create_imagenet.sh
	修改：      examples/imagenet/imagenet_solver.prototxt
	修改：      examples/imagenet/imagenet_train.prototxt
	修改：      examples/imagenet/resume_training.sh
	修改：      examples/mnist/lenet_solver.prototxt
	修改：      include/caffe/common.hpp
	修改：      src/caffe/common.cpp
	修改：      src/caffe/layers/data_layer.cpp
	修改：      src/caffe/layers/relu_layer.cu
	修改：      tools/compute_image_mean.cpp
Merge branch 'master' of git://github.com/zhangxc11/caffe

Conflicts:
	examples/imagenet/create_imagenet.sh
	examples/imagenet/imagenet_solver.prototxt
	examples/mnist/lenet_solver.prototxt