Implemented elementwise max layer
lint & reduce gradient check stepsize to pass checks
Merge pull request #1053 from jeffdonahue/to3i-elem_max_layer

rebase and fixup #688 from @to3i: elementwise max
Fix lmbdb travis with openldap
Merge pull request #1067 from bhack/lmdb

Get lmdb from openldap
restore "red X" build failures in Travis
add -fPIC flag to CMake build
Merge pull request #1051 from jeffdonahue/travis-red-errors

restore "red X" build failures in Travis
Merge branch 'dev' of https://github.com/BVLC/caffe into dev

Conflicts:
	CMakeLists.txt
Added sampler data layer.