Changed linking order: -pthread -> back.
Otherwise error:
/usr/bin/ld: /usr/local/lib/libgflags.a(gflags.cc.o): undefined reference to symbol 'pthread_rwlock_wrlock@@GLIBC_2.2.5'
/lib/x86_64-linux-gnu/libpthread.so.0: error adding symbols: DSO missing from command line
collect2: error: ld returned 1 exit status
Merge remote-tracking branch 'upstream/master'
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
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

Conflicts:
	src/caffe/data_transformer.cpp
Remove Datum from WindowDataLayer

Conflicts:

	src/caffe/layers/window_data_layer.cpp
Update description data_transformer.hpp
Refactor common code

Make lint happy

Conflicts:
	src/caffe/data_transformer.cpp
Add flag check_size=false to convert_imageset
Added test_io and faster cv::Mat processing

Conflicts:
	src/caffe/util/io.cpp
Add CVMatToDatum
Added global_pooling to set the kernel size equal to the bottom size

Added check for padding and stride with global_pooling
[fix] translate g++ whole archive to force load for clang++ compilation

To build with the layer registry clang++ requires `-force_load` as
g++ requires `--whole-archive`.
[fix] set cmake static link command for clang++ and g++ globally
Merge pull request #1215 from shelhamer/clang-whole-archive

[fix] translate g++ whole archive to force load for clang++ compilation
[fix] bend pycaffe to the whims of OS X header order

To build pycaffe on OS X the boost headers need to be in this order.
OS X is a bewildering platform.
[fix] include Python.h instead of re-ordering for pycaffe build on OS X
Merge pull request #1214 from sguada/global_pooling

Add global_pooling to cover the whole input by setting kernel size to bottom size
Add ReadImageToDatumReference to test_io
Added more tests to test_io for CVMatToDatum