Merge branch 'subinterval-cursor' into optimized-ops

Conflicts:
	imglib2/ops/src/main/java/net/imglib2/ops/operation/subset/views/SubsetViews.java
Merged operations from knip_deployment
Merge branch 'master' into optimized-ops
Merged changes to optimized-ops
Added combiners
added fixed version of algorithms
playing with "ops" that have Sampler<T> as input and implement Sampler<T> to represent their output.
Merge branch 'master' into knip_deployment

Conflicts:
	imglib2/core/src/main/java/net/imglib2/meta/ImageMetadata.java
Merge branch 'master' into optimized-ops

Conflicts:
	imglib2/algorithms/gpl/src/main/java/net/imglib2/algorithm/fft2/FFTConvolution.java
	imglib2/algorithms/gpl/src/main/java/net/imglib2/algorithm/pde/MomentOfInertiaTensor2D.java
	imglib2/algorithms/gpl/src/main/java/net/imglib2/algorithm/pde/MomentOfInertiaTensor3D.java
	imglib2/algorithms/gpl/src/test/java/net/imglib2/algorithm/region/BresenhamLineTest.java
	imglib2/core/src/main/java/net/imglib2/img/planar/PlanarImg.java
	imglib2/ops/src/main/java/net/imglib2/ops/img/BinaryUnaryOperationAdapter.java
	imglib2/ops/src/main/java/net/imglib2/ops/img/UnaryBinaryOperationAdapter.java
	imglib2/ops/src/main/java/net/imglib2/ops/img/UnaryOperationBridge.java
	imglib2/ops/src/main/java/net/imglib2/ops/operation/UnaryOutputOperation.java
	imglib2/ops/src/main/java/net/imglib2/ops/operation/img/unary/ImgConvert.java
	imglib2/ops/src/main/java/net/imglib2/ops/operation/img/unary/ImgRotate2D.java
	imglib2/ops/src/main/java/net/imglib2/ops/operation/interval/binary/IntervalsFromDimSelection.java
	imglib2/ops/src/main/java/net/imglib2/ops/operation/iterableinterval/unary/EqualizeHistogram.java
	imglib2/ops/src/main/java/net/imglib2/ops/operation/iterableinterval/unary/MinMax.java
	imglib2/ops/src/main/java/net/imglib2/ops/operation/iterableinterval/unary/NormalizeIterableInterval.java
	imglib2/ops/src/main/java/net/imglib2/ops/operation/randomaccessibleinterval/binary/IterateBinaryOperation.java
	imglib2/ops/src/main/java/net/imglib2/ops/operation/randomaccessibleinterval/unary/IterateUnaryOperation.java
	imglib2/ops/src/main/java/net/imglib2/ops/operation/subset/views/IterableSubsetView.java
	imglib2/ops/src/main/java/net/imglib2/ops/operation/subset/views/SubsetViews.java
removed synchronized tags from Multithreaded ops
Merge remote-tracking branch 'origin/knip_deployment' into knip_deployment
Merge branch 'optimized-ops' into knip_deployment

Conflicts:
	imglib2/algorithms/gpl/src/main/java/net/imglib2/algorithm/features/ObjectCalcAndCache.java
	imglib2/algorithms/gpl/src/test/java/net/imglib2/algorithm/region/BresenhamLineTest.java
	imglib2/core/src/main/java/net/imglib2/combiner/read/CombinedCursor.java
	imglib2/core/src/main/java/net/imglib2/img/array/ArrayLocalizingSubIntervalCursor.java
	imglib2/core/src/main/java/net/imglib2/img/planar/PlanarImg.java
	imglib2/ops/src/main/java/net/imglib2/ops/img/BinaryOperationBasedCombiner.java
	imglib2/ops/src/main/java/net/imglib2/ops/img/BinaryUnaryOperationAdapter.java
	imglib2/ops/src/main/java/net/imglib2/ops/img/UnaryOperationBridge.java
	imglib2/ops/src/main/java/net/imglib2/ops/operation/MultithreadedOps.java
	imglib2/ops/src/main/java/net/imglib2/ops/operation/Operations.java
	imglib2/ops/src/main/java/net/imglib2/ops/operation/img/unary/ImgConvert.java
	imglib2/ops/src/main/java/net/imglib2/ops/operation/interval/binary/IntervalsFromDimSelection.java
	imglib2/ops/src/main/java/net/imglib2/ops/operation/iterableinterval/unary/EqualizeHistogram.java
	imglib2/ops/src/main/java/net/imglib2/ops/operation/iterableinterval/unary/MinMax.java
	imglib2/ops/src/main/java/net/imglib2/ops/operation/subset/views/LabelingView.java
	imglib2/ops/src/test/java/IterablePlanarImgSubIntervalCursorBenchmark.java
Merge branch 'optimized-ops' into knip_deployment

Conflicts:
	imglib2/algorithms/gpl/src/main/java/net/imglib2/algorithm/features/ObjectCalcAndCache.java
	imglib2/algorithms/gpl/src/test/java/net/imglib2/algorithm/region/BresenhamLineTest.java
	imglib2/core/src/main/java/net/imglib2/combiner/read/CombinedCursor.java
	imglib2/core/src/main/java/net/imglib2/img/array/ArrayLocalizingSubIntervalCursor.java
	imglib2/core/src/main/java/net/imglib2/img/planar/PlanarImg.java
	imglib2/ops/src/main/java/net/imglib2/ops/img/BinaryOperationBasedCombiner.java
	imglib2/ops/src/main/java/net/imglib2/ops/img/BinaryUnaryOperationAdapter.java
	imglib2/ops/src/main/java/net/imglib2/ops/img/UnaryOperationBridge.java
	imglib2/ops/src/main/java/net/imglib2/ops/operation/MultithreadedOps.java
	imglib2/ops/src/main/java/net/imglib2/ops/operation/Operations.java
	imglib2/ops/src/main/java/net/imglib2/ops/operation/img/unary/ImgConvert.java
	imglib2/ops/src/main/java/net/imglib2/ops/operation/interval/binary/IntervalsFromDimSelection.java
	imglib2/ops/src/main/java/net/imglib2/ops/operation/iterableinterval/unary/EqualizeHistogram.java
	imglib2/ops/src/main/java/net/imglib2/ops/operation/iterableinterval/unary/MinMax.java
	imglib2/ops/src/main/java/net/imglib2/ops/operation/subset/views/LabelingView.java
	imglib2/ops/src/test/java/IterablePlanarImgSubIntervalCursorBenchmark.java