Merge remote-tracking branch 'upstream/dev' into test
Fix typo in LRN-expression in docs

This is more consistent with krizhevsky2012, and it seems to be what the code does.
Merge pull request #1115 from rickardnorlander/master

Fix typo in LRN-expression in docs
Merge remote-tracking branch 'upstream/dev' into test
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
Merge remote-tracking branch 'upstream/dev' into test
modified test_loss_layers
Merge branch 'test' of https://github.com/zszhong/caffe into test