[again] accumulate diff
Merge branch 'master' into googlenet
add accuracy layer based on a decision tree decision
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into googlenet
add & change model definitions
add & change model definitions
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 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
Merge remote-tracking branch 'origin/googlenet' into googlenet

Conflicts:
	models/new_googlenet/solver.prototxt
	models/new_googlenet/train_val4.prototxt
add transform accuracy layer
Merge branch 'googlenet' into mpi_parallel
add transform accuracy layer
add hierarchy10 model
Merge branch 'googlenet' into mpi_parallel

Conflicts:
	models/googlenet/solver.prototxt
	models/new_googlenet/solver.prototxt
Merge branch 'googlenet' of http://github.com/zhirongw/caffe into googlenet
Merge branch 'googlenet' into mpi_parallel
add log visulizor
Merge remote-tracking branch 'qs/googlenet' into googlenet

Conflicts:
	src/caffe/proto/caffe.proto