add convert_imageset option to resize images; use in
convert_imageset.cpp and document
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
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
Added NeuronLayer<Dtype>::SetUp(bottom, top) to ThresholdLayer
Added the code for threshold_layer to the repo
Fix typo in test_threshold ThresholdParameter
Corrected conditions in test_threshold
Added Threshold layer to neuron_layers.hpp
Added ForwardGPU to ThresholdLayer and to the tests
Fixed typo in Threshold Layer definition