Conflicts:
	src/core/arrays/tnlStaticArray.h
	src/core/arrays/tnlStaticArray1D_impl.h
	src/core/arrays/tnlStaticArray2D_impl.h
	src/core/arrays/tnlStaticArray3D_impl.h
	src/core/arrays/tnlStaticArray_impl.h
	src/core/vectors/tnlSharedVector.h
	src/core/vectors/tnlStaticVector.h
	src/functions/tnlFunctionEnumerator_impl.h
	src/functions/tnlTestFunction.h
	src/solvers/linear/krylov/tnlGMRESSolver_impl.h
	src/solvers/linear/krylov/tnlTFQMRSolver_impl.h
	src/solvers/tnlSolverConfig_impl.h
	tools/src/tnl-cuda-arch.cu

Conflicts:
	src/functions/CMakeLists.txt
	src/functions/tnlTestFunction_impl.h
	src/problems/tnlHeatEquationProblem.h
	src/problems/tnlHeatEquationProblem_impl.h

The condition substituting nextIteration() is different than in the
method itself, because incrementing the iteration counter is avoided.

Conflicts:
	src/mesh/grids/tnlGrid1D.h
	src/mesh/grids/tnlGrid2D.h
	src/mesh/grids/tnlGrid3D.h

Refactoring the Dirichlet and the Neumann boundary conditions.

...and some simplifications in tnlSolverStarter - needs more!

* origin/master:
  Fixing build script.
  Adding OpenMP to vector operations.
  Fixing a bug in host and device arrays comparison.
  Fixing the DICOM reader.
  Fixing DCMTK code to work when DICOM support is not enabled.
  Fixing #1 - tnl-dicom-reader, tnl-image-converter
  Implementing the DICOM reader.
  Implementing the DICOM reader.
  Refactoring code for the DICOM format support.
  Addign DICOM support - TNL can be succesfully build now.
  JPEG format is working.
  Implementing JPEG image write.
  Implementing JPEG image.
  Adding JPEG format support.
  Adding PNG format support.
  Adding conversion from .tnl file to image.
  Implementing image converter.
  Implementing image converter.
  Implementing the image converter.
  Adding image converter.

* master:
  Tuning Ellpack formats.
  Tuning Ellpack format.
  Fixing bug in tnlVector::operator !=.
  Optimizing CUDA L2 norm.
  Adding banchmark for CUDA lp norm.

Conflicts:
	build
	src/core/CMakeLists.txt

Conflicts:
	build

* master:
  Optimizing L1 and L2 norms in CUDA.