add tests for maxpooling layer forward, and for maxpooling with top mask
merge caffe_set definitions; define for int as well
Merge pull request #448 from jeffdonahue/sguada-fix_maxpooling

Finish up max pooling with a mask from @sguada
Tested
fix OSX 10.9 compiler/stdlib override for latest homebrew
Back-merge recent fixes from master to dev

fix OSX 10.9 compiler/stdlib override for latest homebrew
follow-up on #443 to invert k channels (instead of 3)
Correctly invert the swapping of colour channels
link presentation on dropbox (was self-hosted during a dropbox issue)
link to demo
fix draw_net python script
release v1 model defs + weights
point out @niuzhiheng's work on the Windows port
fix test_all path in docs
link canonical bvlc site
fix detection notebook link
10.9 install doc formatting
10.9 install doc formatting
don't pass LDFLAGS when only compiling
Merge pull request #456 from longjon/spurious-ldflags

Don't pass LDFLAGS when only performing compilation (-c)
convert imageset comment fixup
Merge pull request #445 from jeffdonahue/convert_imageset_resize_option

Optionally resize an image set to canonical dimensions when converting.
Do this by default for creating the imagenet train + val leveldbs.
caffe.Net preprocessing members belong to object, not class
Merge pull request #459 from shelhamer/python-net-preprocessing-members

Make net preprocessing options belong to instantiated net and not class
caffe.Net preprocessing members belong to object, not class
Merge pull request #459 from shelhamer/python-net-preprocessing-members

Make net preprocessing options belong to instantiated net and not class
Test for Threshold layer
Fixed ThresholdParam

Conflicts:

	src/caffe/proto/caffe.proto

Conflicts:

	src/caffe/proto/caffe.proto

Conflicts:
	src/caffe/proto/caffe.proto
Fixed name of threshold_ var
Fixed name of blob_bottom_
Added threshold setting test