Fix typo in LRN-expression in docs

This is more consistent with krizhevsky2012, and it seems to be what the code does.
fix directory in finetune pascal example
Merge pull request #1117 from ronghanghu/fix-finetune-example

[fix] set R-CNN fine-tuning PASCAL example paths
drop out-of-date conv test comments
optimize 1x1 convolution for Network-in-Network style layers

1x1 convolution with stride 1 is a special case of Caffe matrix
multiplication convolution for which im2col / col2im transformations are
actually the identity. For this special case the memory and
transformation are skipped.
Back-merge
combine col_{data,diff} into single col_buff to halve memory usage

conv forward / backward only need one of the im2col data and diff
at-a-time so consolidating the two saves a lazy allocation.
Merge pull request #1118 from shelhamer/1x1-conv

Optimize 1x1 convolution for Network-in-Network style operation
Merge pull request #1115 from rickardnorlander/master

Fix typo in LRN-expression in docs
include WindowDataLayer in data param upgrade
load transform params in window data layer
define up-to-date all-in-one model for pascal finetuning
Merge pull request #1126 from shelhamer/window-data-param-upgrade

[fix] include WindowDataLayer in data param upgrade
Back-merge

  define up-to-date all-in-one model for pascal finetuning
  load transform params in window data layer
  include WindowDataLayer in data param upgrade
  Fix typo in LRN-expression in docs
web demo fix, closes #1002
Move data_mean into data_transformer remove datum_* from BaseData

Conflicts:

	src/caffe/layers/memory_data_layer.cpp
Fixed MemoryDataLayer to make it work with pycaffe
Make lint happy
Initial cv::Mat transformation

Added cv::Mat transformation to ImageDataLayer

Conflicts:

	src/caffe/layers/image_data_layer.cpp

Added transform Datum to Blob

Conflicts:

	src/caffe/layers/base_data_layer.cpp
	src/caffe/layers/base_data_layer.cu

Added transform cv::Mat to Blob

Added transform Vector<Datum> to Blob
Make lint happy