Merge branch 'googlenet' into mpi_parallel

Conflicts:
	examples/imagenet/train_googlenet.sh
	models/bvlc_reference_caffenet/train_val.prototxt
	models/googlenet/solver.prototxt
	src/caffe/solver.cpp
Merge remote-tracking branch 'origin/mpi_parallel' into mpi_parallel