diff --git a/Applications/DataExplorer/DataView/CondFromRasterDialog.cpp b/Applications/DataExplorer/DataView/CondFromRasterDialog.cpp
index df1ff79eab1e2b60bc4c0915c3997ccfebbaf53d..9059b34df238df8e860b3975ef0ad6075874e123 100644
--- a/Applications/DataExplorer/DataView/CondFromRasterDialog.cpp
+++ b/Applications/DataExplorer/DataView/CondFromRasterDialog.cpp
@@ -52,7 +52,7 @@ void CondFromRasterDialog::on_selectButton_pressed()
 	QString geotiffExtension("");
 #endif
 	QString fileName = QFileDialog::getOpenFileName(this, "Select raster file",
-	                                                settings.value("lastOpenedRasterFileDirectory").toString(), 
+	                                                settings.value("lastOpenedRasterFileDirectory").toString(),
 	                                                QString("Raster files (*.asc *.grd);;").arg(geotiffExtension));
 
 	if (!fileName.isEmpty())
diff --git a/Applications/DataExplorer/DataView/ElementTreeView.cpp b/Applications/DataExplorer/DataView/ElementTreeView.cpp
index 50004e2a29affaa7ba0414e83ed831132f2df2b0..3b930e9264e1954d14729b3901a1187ffd2e6d25 100644
--- a/Applications/DataExplorer/DataView/ElementTreeView.cpp
+++ b/Applications/DataExplorer/DataView/ElementTreeView.cpp
@@ -20,7 +20,7 @@
 
 #include <QModelIndex>
 
-ElementTreeView::ElementTreeView( QWidget* parent) 
+ElementTreeView::ElementTreeView( QWidget* parent)
 : QTreeView(parent)
 {
 }
diff --git a/Applications/DataExplorer/DataView/GeoOnMeshMappingDialog.cpp b/Applications/DataExplorer/DataView/GeoOnMeshMappingDialog.cpp
index ef9f849503a73317f96a43f418d77308660e6f8a..3404b6c22d2168027cd6458a75b45ea2c83cd9d3 100644
--- a/Applications/DataExplorer/DataView/GeoOnMeshMappingDialog.cpp
+++ b/Applications/DataExplorer/DataView/GeoOnMeshMappingDialog.cpp
@@ -34,9 +34,9 @@ GeoOnMeshMappingDialog::~GeoOnMeshMappingDialog()
 {
 }
 
-int GeoOnMeshMappingDialog::getDataSetChoice() const 
-{ 
-	return this->meshNameComboBox->currentIndex(); 
+int GeoOnMeshMappingDialog::getDataSetChoice() const
+{
+	return this->meshNameComboBox->currentIndex();
 }
 
 void GeoOnMeshMappingDialog::on_meshNameComboBox_currentIndexChanged(int idx)
diff --git a/Applications/DataExplorer/DataView/GeoTreeModel.cpp b/Applications/DataExplorer/DataView/GeoTreeModel.cpp
index 1966d9cb2aca05db5ddb1e23e78c4e31a09aad86..556f329548ab49e1954f047142d19edadd1c0442 100644
--- a/Applications/DataExplorer/DataView/GeoTreeModel.cpp
+++ b/Applications/DataExplorer/DataView/GeoTreeModel.cpp
@@ -339,8 +339,8 @@ void GeoTreeModel::setNameForItem(const std::string &name,
 	}
 
 	auto it = find_if(_lists.begin(), _lists.end(), [&name](GeoTreeItem* geo)
-	{ 
-		return (name.compare( geo->data(0).toString().toStdString() ) == 0); 
+	{
+		return (name.compare( geo->data(0).toString().toStdString() ) == 0);
 	});
 
 	for (int i = 0; i < (*it)->childCount(); i++)
diff --git a/Applications/DataExplorer/DataView/GeoTreeView.cpp b/Applications/DataExplorer/DataView/GeoTreeView.cpp
index 0dd601c0c104d7c4865b797f24e44447274a19cc..6ebbd877c90a7ffd9318fa6b34ad0e9762a13631 100644
--- a/Applications/DataExplorer/DataView/GeoTreeView.cpp
+++ b/Applications/DataExplorer/DataView/GeoTreeView.cpp
@@ -258,7 +258,7 @@ void GeoTreeView::writeToFile() const
 		 file_type.append(";;Legacy geometry file (*.gli)");
 #endif // DEBUG
 		QString geoName = item->data(0).toString();
-		QString fileName = QFileDialog::getSaveFileName(NULL, "Save geometry as", 
+		QString fileName = QFileDialog::getSaveFileName(NULL, "Save geometry as",
 			LastSavedFileDirectory::getDir() + geoName, file_type);
 		if (!fileName.isEmpty())
 		{
diff --git a/Applications/DataExplorer/DataView/LineEditDialog.h b/Applications/DataExplorer/DataView/LineEditDialog.h
index 7e434f6de1c418082a9c9389535922539fd6108f..f4b286afb5cee00844c9d4163ab65b3e5699f921 100644
--- a/Applications/DataExplorer/DataView/LineEditDialog.h
+++ b/Applications/DataExplorer/DataView/LineEditDialog.h
@@ -66,4 +66,3 @@ signals:
 };
 
 #endif //LINEEDITDIALOG_H
-	
\ No newline at end of file
diff --git a/Applications/DataExplorer/DataView/MeshAnalysisDialog.cpp b/Applications/DataExplorer/DataView/MeshAnalysisDialog.cpp
index 70e92be1cf5a21e47cd2cc8a63f914a609b931b2..b75e6fe51982aba66d14dc0c2d865263e5abfc46 100644
--- a/Applications/DataExplorer/DataView/MeshAnalysisDialog.cpp
+++ b/Applications/DataExplorer/DataView/MeshAnalysisDialog.cpp
@@ -63,7 +63,7 @@ void MeshAnalysisDialog::on_startButton_pressed()
 		*mesh, this->zeroVolumeThreshold->text().toDouble() + std::numeric_limits<double>::epsilon()));
 	this->elementsGroupBox->setTitle("Elements (out of " + QString::number(mesh->getNElements()) + ")");
 	this->elementsMsgOutput(element_error_codes);
-	
+
 	unsigned const n_holes (MeshLib::MeshValidation::detectHoles(*mesh));
 	if (n_holes>0)
 		this->meshHoleOutputLabel->setText("<strong>" + QString::number(n_holes) + " hole(s) found within the mesh</strong>");
diff --git a/Applications/DataExplorer/DataView/MeshLayerEditDialog.cpp b/Applications/DataExplorer/DataView/MeshLayerEditDialog.cpp
index 78685474ce5414b84cc38a1d6eb3941953b60ff7..7901fa7e79fbc185a70457115a9d4fa0f450760e 100644
--- a/Applications/DataExplorer/DataView/MeshLayerEditDialog.cpp
+++ b/Applications/DataExplorer/DataView/MeshLayerEditDialog.cpp
@@ -264,7 +264,7 @@ MeshLib::Mesh* MeshLayerEditDialog::createTetMesh()
 		tetgen_interface.writeTetGenSmesh(filename.toStdString(), *tg_mesh, tg_attr);
 	}
 	INFO("Mesh construction time: %d ms.", myTimer0.elapsed());
-		
+
 	return tg_mesh;
 }
 
diff --git a/Applications/DataExplorer/DataView/MeshValueEditDialog.cpp b/Applications/DataExplorer/DataView/MeshValueEditDialog.cpp
index 9ddf71b84453ca83b1f3708239f3cc59975e6adf..3ee70dc1ec4b3265f0a04fb1881f129ed22ab804 100644
--- a/Applications/DataExplorer/DataView/MeshValueEditDialog.cpp
+++ b/Applications/DataExplorer/DataView/MeshValueEditDialog.cpp
@@ -56,7 +56,7 @@ void MeshValueEditDialog::accept()
 			return;
 		}
 	}
-		
+
 	emit valueEditFinished(_mesh);
 	this->done(QDialog::Accepted);
 }
diff --git a/Applications/DataExplorer/DataView/MshView.cpp b/Applications/DataExplorer/DataView/MshView.cpp
index 17f92284089dadf4023ef35c308fa86e3c6a68e1..f80e516dab8be783bab3f362c0807b621736b2ef 100644
--- a/Applications/DataExplorer/DataView/MshView.cpp
+++ b/Applications/DataExplorer/DataView/MshView.cpp
@@ -191,7 +191,7 @@ void MshView::extractSurfaceMesh()
 	SurfaceExtractionDialog dlg;
 	if (dlg.exec() != QDialog::Accepted)
 		return;
-	
+
 	MathLib::Vector3 const& dir (dlg.getNormal());
 	int const tolerance (dlg.getTolerance());
 	MeshLib::Mesh* sfc_mesh (MeshLib::MeshSurfaceExtraction::getMeshSurface(*mesh, dir, tolerance));
diff --git a/Applications/DataExplorer/DataView/SetNameDialog.cpp b/Applications/DataExplorer/DataView/SetNameDialog.cpp
index 09c37090ccc0334488be5fd803b9b917e590e391..871c2a06dff1085ff60ef2c1b9dc453aff8ec4e4 100644
--- a/Applications/DataExplorer/DataView/SetNameDialog.cpp
+++ b/Applications/DataExplorer/DataView/SetNameDialog.cpp
@@ -20,7 +20,7 @@
 #include <QLineEdit>
 #include <QVBoxLayout>
 
-SetNameDialog::SetNameDialog(const std::string &geo_object_type, std::size_t id, const std::string &old_name = "", QDialog* parent) 
+SetNameDialog::SetNameDialog(const std::string &geo_object_type, std::size_t id, const std::string &old_name = "", QDialog* parent)
 :QDialog(parent)
 {
 	QString const& label = QString::fromStdString(geo_object_type) + "#" + QString::number(id);
@@ -54,9 +54,9 @@ void SetNameDialog::setupDialog(const QString &label, const std::string &old_nam
 	setLayout(_layout);
 }
 
-std::string SetNameDialog::getNewName() 
+std::string SetNameDialog::getNewName()
 {
-	return _new_name->text().toStdString(); 
+	return _new_name->text().toStdString();
 }
 
 void SetNameDialog::accept()
diff --git a/Applications/DataExplorer/DataView/StationTreeModel.cpp b/Applications/DataExplorer/DataView/StationTreeModel.cpp
index 6307f48d95b60924214b3631eb6bdd0490b01a6e..2a6177928631af64d7cf0b243dfc4e6dffb80342 100644
--- a/Applications/DataExplorer/DataView/StationTreeModel.cpp
+++ b/Applications/DataExplorer/DataView/StationTreeModel.cpp
@@ -131,7 +131,7 @@ void StationTreeModel::addStationList(QString listName, const std::vector<GeoLib
 
 		ModelTreeItem* child = new ModelTreeItem(stn, group);
 		child->setStation(static_cast<GeoLib::Station*>((*stations)[i]));
-		group->appendChild(child);	
+		group->appendChild(child);
 	}
 
 	qDebug() << "List" << listName << "loaded, " << stations->size() << "items added.";
diff --git a/Applications/DataExplorer/DataView/StationTreeView.cpp b/Applications/DataExplorer/DataView/StationTreeView.cpp
index 624666825e844012b5702de5dda4b42a1d95d4d4..143e054f290f79652e4e320bcf406879b7d56d1a 100644
--- a/Applications/DataExplorer/DataView/StationTreeView.cpp
+++ b/Applications/DataExplorer/DataView/StationTreeView.cpp
@@ -167,7 +167,7 @@ void StationTreeView::writeToFile()
 	{
 		TreeItem* item = static_cast<StationTreeModel*>(model())->getItem(index);
 		QString listName = item->data(0).toString();
-		QString fileName = QFileDialog::getSaveFileName(this, "Save station list", 
+		QString fileName = QFileDialog::getSaveFileName(this, "Save station list",
 			LastSavedFileDirectory::getDir() + listName, "*.stn");
 		if (!fileName.isEmpty())
 		{
diff --git a/Applications/DataExplorer/DataView/SurfaceExtractionDialog.cpp b/Applications/DataExplorer/DataView/SurfaceExtractionDialog.cpp
index 030c669d89e1a8908156d493388a8e83ca4a206e..e55797f2363c7651266b18fff2bff60e55b313c5 100644
--- a/Applications/DataExplorer/DataView/SurfaceExtractionDialog.cpp
+++ b/Applications/DataExplorer/DataView/SurfaceExtractionDialog.cpp
@@ -28,8 +28,8 @@ SurfaceExtractionDialog::SurfaceExtractionDialog(QDialog* parent)
 
 void SurfaceExtractionDialog::accept()
 {
-	_dir = MathLib::Vector3(xNormalEdit->text().toDouble(), 
-	                        yNormalEdit->text().toDouble(), 
+	_dir = MathLib::Vector3(xNormalEdit->text().toDouble(),
+	                        yNormalEdit->text().toDouble(),
 	                        zNormalEdit->text().toDouble());
 	_tolerance = degreesSpinBox->text().toInt();
 
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeElementSelectionFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeElementSelectionFilter.cpp
index 26f84348ffe57a1cc0707cf44d3d1cd5531cc91b..e6e021868e2bd803599eff5b363fa71b77ea0500 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeElementSelectionFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeElementSelectionFilter.cpp
@@ -59,14 +59,14 @@ void VtkCompositeElementSelectionFilter::init()
 		idFilter->CellIdsOn();
 		idFilter->FieldDataOn();
 		idFilter->Update();
-		
+
 	vtkThreshold* threshold = vtkThreshold::New();
 		threshold->SetInputConnection(idFilter->GetOutputPort());
 		threshold->SetInputArrayToProcess(0,0,0,vtkDataObject::FIELD_ASSOCIATION_CELLS, _selection_name.c_str());
 		threshold->SetSelectedComponent(0);
 		threshold->ThresholdBetween(thresholdLower, thresholdUpper);
 		threshold->Update();
-		
+
 	QList<QVariant> thresholdRangeList;
 	thresholdRangeList.push_back(thresholdLower);
 	thresholdRangeList.push_back(thresholdUpper);
@@ -78,7 +78,7 @@ void VtkCompositeElementSelectionFilter::setSelectionArray(const std::string &se
 {
 	_selection_name = selection_name;
 	_selection = selection;
-	init(); 
+	init();
 }
 
 void VtkCompositeElementSelectionFilter::SetUserVectorProperty( QString name, QList<QVariant> values)
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeGeoObjectFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeGeoObjectFilter.cpp
index d910a68ab37136c2bfc2b272a50206280dde9145..cf5532426b6dd975c0d75c6dc64171a4b3dab422 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeGeoObjectFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeGeoObjectFilter.cpp
@@ -47,7 +47,7 @@ VtkCompositeGeoObjectFilter::VtkCompositeGeoObjectFilter( vtkAlgorithm* inputAlg
 		{
 			/* TODO
 			if (dynamic_cast<VtkStationSource*>(parentAlg)->getType() == GeoLib::Station::StationType::BOREHOLE)
-				_type = GeoLib::GEOTYPE::POLYLINE; 
+				_type = GeoLib::GEOTYPE::POLYLINE;
 			*/
 		}
 	  }
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeNodeSelectionFilter.h b/Applications/DataExplorer/VtkVis/VtkCompositeNodeSelectionFilter.h
index b7734c89f25f04482e1ea8d9e73db66185060162..095428392dac2583c77a4d3d4bb61ca1dc89e903 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeNodeSelectionFilter.h
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeNodeSelectionFilter.h
@@ -31,7 +31,7 @@ public:
 
 	/// Sets the point indeces to be highlighted
 	void setSelectionArray(const std::vector<unsigned> &point_indeces);
-	
+
 private:
 	std::vector<GeoLib::Point*> _selection;
 };
diff --git a/Applications/Utils/GeoTools/CMakeLists.txt b/Applications/Utils/GeoTools/CMakeLists.txt
index c2366fecd1bf917aeb98bffd3fedaf3fedad637c..a63a3a0428c7a064ac33ee76bdce672158960444 100644
--- a/Applications/Utils/GeoTools/CMakeLists.txt
+++ b/Applications/Utils/GeoTools/CMakeLists.txt
@@ -22,5 +22,5 @@ if(QT4_FOUND)
 		MoveGeometry
 		RUNTIME DESTINATION bin
 		COMPONENT Utilities
-	)	
+	)
 endif() # QT4_FOUND
diff --git a/Applications/Utils/GeoTools/TriangulatePolyline.cpp b/Applications/Utils/GeoTools/TriangulatePolyline.cpp
index 258cc59c33111a03969f9acf29ab757b11e19eea..e5ab63a72da6fa9f6e3f0ab1584a5ddc7a67ed36 100644
--- a/Applications/Utils/GeoTools/TriangulatePolyline.cpp
+++ b/Applications/Utils/GeoTools/TriangulatePolyline.cpp
@@ -88,7 +88,7 @@ int main(int argc, char *argv[])
 		std::string input ("");
 		while (input != "y" && input != "Y" && input != "n" && input != "N")
 			input = output_question();
-		
+
 		if (input == "y" || input == "Y")
 		{
 			line->closePolyline();
diff --git a/Applications/Utils/MeshEdit/checkMesh.cpp b/Applications/Utils/MeshEdit/checkMesh.cpp
index d4b696e1b9e6a04e9e43919c47d97a3f7516b52f..4b4604ea933f5b612a18efbc21bc275b870e24c7 100644
--- a/Applications/Utils/MeshEdit/checkMesh.cpp
+++ b/Applications/Utils/MeshEdit/checkMesh.cpp
@@ -110,7 +110,7 @@ int main(int argc, char *argv[])
 		else
 			INFO ("No holes found within the mesh.");
 	}
-	
+
 	delete mesh;
 	delete custom_format;
 	delete logog_cout;
diff --git a/Applications/Utils/OGSFileConverter/FileListDialog.cpp b/Applications/Utils/OGSFileConverter/FileListDialog.cpp
index deef2f9d5a9d4f6e04861619b1431fef2d5a3287..fccba77b54d17914931758ea81603b083eb914e9 100644
--- a/Applications/Utils/OGSFileConverter/FileListDialog.cpp
+++ b/Applications/Utils/OGSFileConverter/FileListDialog.cpp
@@ -43,7 +43,7 @@ void FileListDialog::on_addButton_pressed()
 	{
 		QStringList const file_names = dlg.selectedFiles();
 
-		if (file_names.empty()) 
+		if (file_names.empty())
 			return;
 
 		QStringList list = _allFiles.stringList();
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e80b5987b0bdc4c006e06f8dad0732c54b9c5c10..4fc8175e6e04a3a1e0ebeecdb5dd75c567c86bfa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,7 @@ The second release of ogs6 introduces Neumann boundary conditions and VTK result
 ### Features:
 
 - [Neumann boundary conditions](http://docs.opengeosys.org/docs/benchmarks/elliptic/groundwater-flow-neumann)
-- Implement mesh properties for storage of data fields. This also includes mapped values (e.g. based on material id) [PR #542](https://github.com/ufz/ogs/pull/542), [PR #644](https://github.com/ufz/ogs/pull/644), 
+- Implement mesh properties for storage of data fields. This also includes mapped values (e.g. based on material id) [PR #542](https://github.com/ufz/ogs/pull/542), [PR #644](https://github.com/ufz/ogs/pull/644),
 - Refactored mesh property classes to [enable VTK output](https://github.com/ufz/ogs/pull/692)
 - Extended the available elements to quadratic (e.g. Quad8) based on generalized "element rules".  [#572](https://github.com/ufz/ogs/pull/572), [PR #656](https://github.com/ufz/ogs/pull/656), [PR #657](https://github.com/ufz/ogs/pull/657),
 - Extend computation of shape matrices to lower dimensional elements embedded in higher dimensional space [#655](https://github.com/ufz/ogs/pull/655)
diff --git a/Documentation/Namespaces.dox b/Documentation/Namespaces.dox
index 91ac6561980ebea4bb6c6117ee26b68a43adfaae..b9700bca5b5582a08e6913c3a5b24575c2f3e931 100644
--- a/Documentation/Namespaces.dox
+++ b/Documentation/Namespaces.dox
@@ -41,7 +41,7 @@ namespace FileIO {
 	 */
 	namespace GMSH {
 	}
-	
+
 	/**
 	 * @namespace FileIO::Legacy
 	 * Includes the interfaces to OGS legacy file formats (OGS-5 and below).
@@ -61,7 +61,7 @@ namespace FiniteElement {
  * Contains all functionality concerned with defining and obtaining information
  * about geometric objects such as points, (poly-)lines, polygones, surfaces, etc.
  * Also includes additional algorithms for modifying such data.
- */ 
+ */
 namespace GeoLib {
 }
 
@@ -71,7 +71,7 @@ namespace GeoLib {
  * or calculating a norm to integration schemes and matrix preconditioners.
  *
  * \sa detail
- */ 
+ */
 namespace MathLib {
 	/**
 	 * @namespace MathLib::detail
@@ -87,7 +87,7 @@ namespace MathLib {
  * algorithms for generating and modifying meshes and elements.
  *
  * \sa MeshGenerator
- */ 
+ */
 namespace MeshLib {
 	/**
 	 * @namespace MeshLib::MeshGenerator
@@ -104,7 +104,7 @@ namespace MeshLib {
 namespace NumLib {
 	/**
 	 * @namespace NumLib::detail
-	 */	
+	 */
 	namespace detail {
 	}
 }
diff --git a/FileIO/AsciiRasterInterface.cpp b/FileIO/AsciiRasterInterface.cpp
index 4374cbddb71e94b6c1f460e4c06b62e20df7a86f..81a72201a935d7c00db190a9a17bdd8e2b38b768 100644
--- a/FileIO/AsciiRasterInterface.cpp
+++ b/FileIO/AsciiRasterInterface.cpp
@@ -126,7 +126,7 @@ GeoLib::Raster* AsciiRasterInterface::getRasterFromSurferFile(std::string const&
 	std::size_t n_cols(0), n_rows(0);
 	double xllcorner(0.0), yllcorner(0.0), cell_size(0.0), min(0.0), max(0.0);
 
-	if (readSurferHeader(in, n_cols, n_rows, xllcorner, yllcorner, cell_size, min, max)) 
+	if (readSurferHeader(in, n_cols, n_rows, xllcorner, yllcorner, cell_size, min, max))
 	{
 		const double no_data_val (min-1);
 		double* values = new double[n_cols*n_rows];
@@ -157,7 +157,7 @@ bool AsciiRasterInterface::readSurferHeader(std::ifstream &in, std::size_t &n_co
 				double &xllcorner, double &yllcorner, double &cell_size, double &min, double &max)
 {
 	std::string tag;
-	
+
 	in >> tag;
 
 	if (tag.compare("DSAA") != 0)
@@ -205,7 +205,7 @@ void AsciiRasterInterface::writeRasterAsASC(GeoLib::Raster const& raster, std::s
 
     // write data
     double const*const elevation(raster.begin());
-    for (unsigned row(0); row < nRows; ++row) 
+    for (unsigned row(0); row < nRows; ++row)
     {
         for (unsigned col(0); col < nCols; ++col)
         {
diff --git a/FileIO/GmshIO/GMSHFixedMeshDensity.cpp b/FileIO/GmshIO/GMSHFixedMeshDensity.cpp
index b082bf37b67eb067a8e0d7099945eb56b482c831..0dbebe52e6ecef7bd7ed9d940592366f576b2951 100644
--- a/FileIO/GmshIO/GMSHFixedMeshDensity.cpp
+++ b/FileIO/GmshIO/GMSHFixedMeshDensity.cpp
@@ -14,7 +14,7 @@
 
 #include "GmshIO/GMSHFixedMeshDensity.h"
 
-namespace FileIO 
+namespace FileIO
 {
 namespace GMSH {
 
diff --git a/FileIO/GmshIO/GMSHFixedMeshDensity.h b/FileIO/GmshIO/GMSHFixedMeshDensity.h
index 320203c4201101b4f75ab0bd7ea75e8ff1d7ad40..fbbe142d78d0dc11971dec95b49370dba8d6ceed 100644
--- a/FileIO/GmshIO/GMSHFixedMeshDensity.h
+++ b/FileIO/GmshIO/GMSHFixedMeshDensity.h
@@ -17,7 +17,7 @@
 
 #include "GMSHMeshDensityStrategy.h"
 
-namespace FileIO 
+namespace FileIO
 {
 namespace GMSH {
 
diff --git a/FileIO/GmshIO/GMSHLine.cpp b/FileIO/GmshIO/GMSHLine.cpp
index d277226476ddfdeb015698ac2e5d8d5b04307bc9..82166f2c9468842021f7662ca076f50e4a6f9595 100644
--- a/FileIO/GmshIO/GMSHLine.cpp
+++ b/FileIO/GmshIO/GMSHLine.cpp
@@ -15,7 +15,7 @@
 #include <ostream>
 #include "GMSHLine.h"
 
-namespace FileIO 
+namespace FileIO
 {
 namespace GMSH {
 
diff --git a/FileIO/GmshIO/GMSHLine.h b/FileIO/GmshIO/GMSHLine.h
index 0a53e8967a45486798631710b425355cadc00016..7c6a35221027ec88743aa1ec33b30985c5595f9c 100644
--- a/FileIO/GmshIO/GMSHLine.h
+++ b/FileIO/GmshIO/GMSHLine.h
@@ -17,7 +17,7 @@
 
 #include <iosfwd>
 
-namespace FileIO 
+namespace FileIO
 {
 namespace GMSH {
 
diff --git a/FileIO/GmshIO/GMSHLineLoop.cpp b/FileIO/GmshIO/GMSHLineLoop.cpp
index ef6e848e390c467d16cb1f345da39b01b4c9433f..5a40ce7e5ac2a32a1b19596944425ef661bad983 100644
--- a/FileIO/GmshIO/GMSHLineLoop.cpp
+++ b/FileIO/GmshIO/GMSHLineLoop.cpp
@@ -17,7 +17,7 @@
 #include "GMSHLine.h"
 #include "GMSHLineLoop.h"
 
-namespace FileIO 
+namespace FileIO
 {
 namespace GMSH {
 
diff --git a/FileIO/GmshIO/GMSHLineLoop.h b/FileIO/GmshIO/GMSHLineLoop.h
index 2cf12a12ccb7079acb4ba225cb36661f133a1c2c..1ea5369144b2280d47b650d2f138bbba5dcdfaab 100644
--- a/FileIO/GmshIO/GMSHLineLoop.h
+++ b/FileIO/GmshIO/GMSHLineLoop.h
@@ -19,7 +19,7 @@
 #include <iosfwd>
 
 
-namespace FileIO 
+namespace FileIO
 {
 namespace GMSH {
 
diff --git a/FileIO/GmshIO/GMSHNoMeshDensity.h b/FileIO/GmshIO/GMSHNoMeshDensity.h
index 9506dbe7f141ae3ead6c9c05ef361557ade0dd0b..4c129b0b0c9d6fef6c15a1000056926ffdbb29b8 100644
--- a/FileIO/GmshIO/GMSHNoMeshDensity.h
+++ b/FileIO/GmshIO/GMSHNoMeshDensity.h
@@ -17,7 +17,7 @@
 
 #include "GMSHMeshDensityStrategy.h"
 
-namespace FileIO 
+namespace FileIO
 {
 namespace GMSH {
 
diff --git a/FileIO/GmshIO/GMSHPolygonTree.cpp b/FileIO/GmshIO/GMSHPolygonTree.cpp
index bf9105b2a4609c67b67f89f0f258924277c5c6d5..2459760a53d40e55b16a259c81a6c3a1a9a042d2 100644
--- a/FileIO/GmshIO/GMSHPolygonTree.cpp
+++ b/FileIO/GmshIO/GMSHPolygonTree.cpp
@@ -23,7 +23,7 @@
 #include "GeoLib/Polygon.h"
 #include "GeoLib/PolylineWithSegmentMarker.h"
 
-namespace FileIO 
+namespace FileIO
 {
 namespace GMSH {
 
diff --git a/FileIO/GmshIO/GMSHPolygonTree.h b/FileIO/GmshIO/GMSHPolygonTree.h
index e9790e9b1b0d2782d9a5618185672f0f7f05ad88..3d33fa4151345927aa7d577911347e4b804215f0 100644
--- a/FileIO/GmshIO/GMSHPolygonTree.h
+++ b/FileIO/GmshIO/GMSHPolygonTree.h
@@ -31,7 +31,7 @@ namespace GeoLib
     class PolylineWithSegmentMarker;
 }
 
-namespace FileIO 
+namespace FileIO
 {
 namespace GMSH {
 
diff --git a/FileIO/XmlIO/Qt/XmlGmlInterface.cpp b/FileIO/XmlIO/Qt/XmlGmlInterface.cpp
index 24bb979b2b140f8d22d3b771e5d14bd80182ae22..97168924690fdfadc7aab028245b7c93ca172036 100644
--- a/FileIO/XmlIO/Qt/XmlGmlInterface.cpp
+++ b/FileIO/XmlIO/Qt/XmlGmlInterface.cpp
@@ -109,7 +109,7 @@ void XmlGmlInterface::readPoints(const QDomNode &pointsRoot, std::vector<GeoLib:
 		if (point.hasAttribute("name"))
 			pnt_names->insert( std::pair<std::string, std::size_t>(
 										point.attribute("name").toStdString(), points->size()) );
-		
+
 		points->push_back(p);
 		point = point.nextSiblingElement();
 	}
diff --git a/FileIO/XmlIO/Qt/XmlNumInterface.cpp b/FileIO/XmlIO/Qt/XmlNumInterface.cpp
index 27ca1f0f045d94693b49de316f540cf1fa11aa47..4cd6b4d48c1fadc330fd43fdf8302fff138ebf8e 100644
--- a/FileIO/XmlIO/Qt/XmlNumInterface.cpp
+++ b/FileIO/XmlIO/Qt/XmlNumInterface.cpp
@@ -70,7 +70,7 @@ void XmlNumInterface::readLinearSolverConfiguration(QDomElement const& lin_root)
 {
 	std::string const library = lin_root.attribute("Library").toStdString();
 	std::string lin_solver_type, precond_type("no");
-			
+
 	QDomElement linear_solver_node = lin_root.firstChildElement();
 	while (!linear_solver_node.isNull())
 	{
diff --git a/GeoLib/MinimalBoundingSphere.cpp b/GeoLib/MinimalBoundingSphere.cpp
index 98165116fad5790090b1a9fa9d117ca770bfdf59..ae2051219352b0d4973faaaecdeba992ff91ef91 100644
--- a/GeoLib/MinimalBoundingSphere.cpp
+++ b/GeoLib/MinimalBoundingSphere.cpp
@@ -59,7 +59,7 @@ MinimalBoundingSphere::MinimalBoundingSphere(MathLib::Point3d const& p,
     if (cross_ab.getLength() > 0)
     {
         double const denom = 2.0 * scalarProduct(cross_ab,cross_ab);
-        MathLib::Vector3 const o = (scalarProduct(b,b) * crossProduct(cross_ab, a) 
+        MathLib::Vector3 const o = (scalarProduct(b,b) * crossProduct(cross_ab, a)
                                    + scalarProduct(a,a) * crossProduct(b, cross_ab))
                                   * (1.0 / denom);
         _radius = o.getLength() + std::numeric_limits<double>::epsilon();
@@ -89,9 +89,9 @@ MinimalBoundingSphere::MinimalBoundingSphere(MathLib::Point3d const& p,
     if (!GeoLib::isCoplanar(p, q, r, s))
     {
         double const denom = 2.0 * GeoLib::scalarTriple(a,b,c);
-        MathLib::Vector3 const o = (scalarProduct(c,c) * crossProduct(a,b) 
+        MathLib::Vector3 const o = (scalarProduct(c,c) * crossProduct(a,b)
                                   + scalarProduct(b,b) * crossProduct(c,a)
-                                  + scalarProduct(a,a) * crossProduct(b,c)) 
+                                  + scalarProduct(a,a) * crossProduct(b,c))
                                   * (1.0 / denom);
 
         _radius = o.getLength() + std::numeric_limits<double>::epsilon();
diff --git a/GeoLib/Raster.cpp b/GeoLib/Raster.cpp
index 5f4da691e77fb2c3a260ae8c397f2d0087f36f90..5c08f446ef2e591a4844a741d230b84bfd25f1c8 100644
--- a/GeoLib/Raster.cpp
+++ b/GeoLib/Raster.cpp
@@ -105,7 +105,7 @@ Raster* Raster::getRasterFromSurface(Surface const& sfc, double cell_size, doubl
 
 double Raster::getValueAtPoint(const MathLib::Point3d &pnt) const
 {
-	if (pnt[0]>=_ll_pnt[0] && pnt[0]<(_ll_pnt[0]+(_cell_size*_n_cols)) && 
+	if (pnt[0]>=_ll_pnt[0] && pnt[0]<(_ll_pnt[0]+(_cell_size*_n_cols)) &&
 		pnt[1]>=_ll_pnt[1] && pnt[1]<(_ll_pnt[1]+(_cell_size*_n_rows)))
 	{
 		int cell_x = static_cast<int>(std::floor((pnt[0] - _ll_pnt[0])/_cell_size));
diff --git a/GeoLib/Raster.h b/GeoLib/Raster.h
index 4ccb001bf7d0b9cffea380314a63543519f0a7bd..2e197b7a5d88494c96d2c5761fc945fac236ae04 100644
--- a/GeoLib/Raster.h
+++ b/GeoLib/Raster.h
@@ -103,7 +103,7 @@ public:
 
 	/// Interpolates the elevation of the given point based on the 8-neighbourhood of the raster cell it is located on
 	double interpolateValueAtPoint(const MathLib::Point3d &pnt) const;
-    
+
 	/// Checks if the given point is located within the (x,y)-extension of the raster.
 	bool isPntOnRaster(MathLib::Point3d const& node) const;
 
diff --git a/GeoLib/TemplateVec.h b/GeoLib/TemplateVec.h
index f8315c944728bae5ac6003bb1b57aa4a211f8f2e..74dc8a8c801e799b84481c15fe8056ffba06aae6 100644
--- a/GeoLib/TemplateVec.h
+++ b/GeoLib/TemplateVec.h
@@ -89,7 +89,7 @@ public:
 
 	/// Returns the begin of the name id mapping structure
 	NameIdMap::const_iterator getNameIDMapBegin() const { return _name_id_map->cbegin(); }
-	
+
 	/// Returns the end of the name id mapping structure
 	NameIdMap::const_iterator getNameIDMapEnd() const { return _name_id_map->cend(); }
 
diff --git a/MathLib/LinAlg/Dense/GlobalDenseMatrix-impl.h b/MathLib/LinAlg/Dense/GlobalDenseMatrix-impl.h
index ef891c366c389f76f87e3644d1292e941674f745..b11b9eebffc32dadc88790af82eb7e2908bd1891 100644
--- a/MathLib/LinAlg/Dense/GlobalDenseMatrix-impl.h
+++ b/MathLib/LinAlg/Dense/GlobalDenseMatrix-impl.h
@@ -2,7 +2,7 @@
  * @file GlobalDenseMatrix.tpp
  * @author Thomas Fischer
  * @date Jun 10, 2013
- * @brief 
+ * @brief
  *
  * @copyright
  * Copyright (c) 2012-2015, OpenGeoSys Community (http://www.opengeosys.org)
diff --git a/MathLib/LinAlg/Dense/GlobalDenseMatrix.h b/MathLib/LinAlg/Dense/GlobalDenseMatrix.h
index db143cee74c35d1fb77344f60c71d67a4a26ee8d..46f13c7e50d30786d41315d848ead9b2c88e4d94 100644
--- a/MathLib/LinAlg/Dense/GlobalDenseMatrix.h
+++ b/MathLib/LinAlg/Dense/GlobalDenseMatrix.h
@@ -2,7 +2,7 @@
  * @file GlobalDenseMatrix.h
  * @author Thomas Fischer
  * @date Jun 4, 2013
- * @brief 
+ * @brief
  *
  * @copyright
  * Copyright (c) 2012-2015, OpenGeoSys Community (http://www.opengeosys.org)
diff --git a/MathLib/LinAlg/Eigen/EigenMatrix.h b/MathLib/LinAlg/Eigen/EigenMatrix.h
index 5ea1b1e25ecf84c9d1885ffa968eefe63e0ba7a5..ad5758afc24ba7d038225ba9203c69b3510d89fa 100644
--- a/MathLib/LinAlg/Eigen/EigenMatrix.h
+++ b/MathLib/LinAlg/Eigen/EigenMatrix.h
@@ -63,7 +63,7 @@ public:
         auto const N = _mat.nonZeros();
         for (std::remove_const<decltype(N)>::type i=0; i<N; i++)
             _mat.valuePtr()[i] = 0;
-        // don't use _mat.setZero(). it makes a matrix uncompressed 
+        // don't use _mat.setZero(). it makes a matrix uncompressed
     }
 
     /// set a value to the given entry. If the entry doesn't exist, this class
diff --git a/MathLib/LinAlg/FinalizeMatrixAssembly.h b/MathLib/LinAlg/FinalizeMatrixAssembly.h
index aecd590343aabc6512233ebf46cc7cb27fc7f2bf..5df0bb721ccba2c78b1e6df724cbe8a1d179ac1c 100644
--- a/MathLib/LinAlg/FinalizeMatrixAssembly.h
+++ b/MathLib/LinAlg/FinalizeMatrixAssembly.h
@@ -2,7 +2,7 @@
  * @file FinalizeMatrixAssembly.h
  * @author Thomas Fischer
  * @date Jun 11, 2013
- * @brief 
+ * @brief
  *
  * @copyright
  * Copyright (c) 2012-2015, OpenGeoSys Community (http://www.opengeosys.org)
diff --git a/MathLib/LinAlg/PETSc/PETScLinearSolver.cpp b/MathLib/LinAlg/PETSc/PETScLinearSolver.cpp
index ed106870e04aea7dfa9b68c49df52ba9d013f993..2fddd7de6a46329d9135157d9fddc9bf468dc9fa 100644
--- a/MathLib/LinAlg/PETSc/PETScLinearSolver.cpp
+++ b/MathLib/LinAlg/PETSc/PETScLinearSolver.cpp
@@ -39,7 +39,7 @@ bool PETScLinearSolver::solve(const PETScVector &b, PETScVector &x)
 {
     BaseLib::RunTime wtimer;
     wtimer.start();
-    	
+
 // define TEST_MEM_PETSC
 #ifdef TEST_MEM_PETSC
     PetscLogDouble mem1, mem2;
diff --git a/MeshGeoToolsLib/GeoMapper.h b/MeshGeoToolsLib/GeoMapper.h
index ecaca3c38b72df74f18860bbf4c8f3784cd30cdb..af3b0038b54b333507223c0dd1b5961bd2642661 100644
--- a/MeshGeoToolsLib/GeoMapper.h
+++ b/MeshGeoToolsLib/GeoMapper.h
@@ -45,7 +45,7 @@ public:
 
 	/// Maps geometry based on a raster file
 	void mapOnDEM(const std::string &file_name);
-	
+
 	/// Maps geometry based on a mesh file
 	void mapOnMesh(const std::string &file_name);
 
@@ -61,7 +61,7 @@ public:
 	/**
 	 * Maps the geometry based on the given mesh file. A new geometry is created where all
 	 * geometric points are assigned an elevation value on the mesh surface. Additional points are
-	 * inserted whenever a polyline from the original geometry intersects a mesh node or the edge 
+	 * inserted whenever a polyline from the original geometry intersects a mesh node or the edge
 	 * of a mesh element.
 	 * \param mesh          Mesh the geometry is mapped on
 	 * \param new_geo_name  Name of the newly created geometry
diff --git a/MeshGeoToolsLib/MeshNodesOnPoint.h b/MeshGeoToolsLib/MeshNodesOnPoint.h
index 722304b24097a06c8b28ea1e635ec3c8754e4a34..2e78e42dbbf0528ec6b694c74485f154b4ab64c2 100644
--- a/MeshGeoToolsLib/MeshNodesOnPoint.h
+++ b/MeshGeoToolsLib/MeshNodesOnPoint.h
@@ -30,8 +30,8 @@ class MeshNodesOnPoint
 {
 public:
 	/**
-	 * Constructor of object, that search mesh nodes at a GeoLib::Point point 
-	 * within a given search radius. 
+	 * Constructor of object, that search mesh nodes at a GeoLib::Point point
+	 * within a given search radius.
 	 * @param mesh Mesh object whose nodes are searched
 	 * @param mesh_grid Grid object constructed with mesh nodes
 	 * @param pnt a point
diff --git a/MeshLib/Elements/HexRule8.cpp b/MeshLib/Elements/HexRule8.cpp
index 50156e80d4d9e138407a8c8f5ec5a8c4e0575a6d..2580102bb4e00f4c24f0297c2257c55f5a40a389 100644
--- a/MeshLib/Elements/HexRule8.cpp
+++ b/MeshLib/Elements/HexRule8.cpp
@@ -99,7 +99,7 @@ ElementErrorCode HexRule8::validate(const Element* e)
 {
 	ElementErrorCode error_code;
 	error_code[ElementErrorFlag::ZeroVolume] = e->hasZeroVolume();
-		
+
 	for (unsigned i=0; i<6; ++i)
 	{
 		if (error_code.all())
diff --git a/MeshLib/Mesh.h b/MeshLib/Mesh.h
index 3e409a8df004c733836f803831d159ee3a54846b..b973b84f05495701b521ddc921b40a7b63695f69 100644
--- a/MeshLib/Mesh.h
+++ b/MeshLib/Mesh.h
@@ -103,7 +103,7 @@ public:
 
 	/// Resets the IDs of all mesh-elements to their position in the element vector
 	void resetElementIDs();
-	
+
 	/// Resets the IDs of all mesh-nodes to their position in the node vector
 	void resetNodeIDs();
 
diff --git a/MeshLib/MeshEditing/projectMeshOntoPlane.h b/MeshLib/MeshEditing/projectMeshOntoPlane.h
index 4d04108326fa1a7a74f17cb016dbb012e7dc4bf8..4d0235d8e36cafb0e199759b03c1480eb8111bd0 100644
--- a/MeshLib/MeshEditing/projectMeshOntoPlane.h
+++ b/MeshLib/MeshEditing/projectMeshOntoPlane.h
@@ -33,8 +33,8 @@ namespace MeshLib {
  * Overlapping elements, collapsed nodes, and other issues are not handled by the method.
  * The normal vector need not be normalized.
  */
-MeshLib::Mesh* projectMeshOntoPlane(MeshLib::Mesh const& mesh, 
-                                    MathLib::Point3d const& plane_origin, 
+MeshLib::Mesh* projectMeshOntoPlane(MeshLib::Mesh const& mesh,
+                                    MathLib::Point3d const& plane_origin,
                                     MathLib::Vector3 const& plane_normal)
 {
 	std::size_t const n_nodes (mesh.getNNodes());
@@ -51,7 +51,7 @@ MeshLib::Mesh* projectMeshOntoPlane(MeshLib::Mesh const& mesh,
 		new_nodes.push_back(new MeshLib::Node(node - dist * normal));
 	}
 
-	return new MeshLib::Mesh("Projected_Mesh", new_nodes, 
+	return new MeshLib::Mesh("Projected_Mesh", new_nodes,
 	                         MeshLib::copyElementVector(mesh.getElements(), new_nodes));
 }
 
diff --git a/MeshLib/MeshGenerators/LayeredMeshGenerator.cpp b/MeshLib/MeshGenerators/LayeredMeshGenerator.cpp
index 8cc06b1a59464580590ec1dfeffa43babbc7de64..00f74050169e58962c83577e57bad51c3544dc9b 100644
--- a/MeshLib/MeshGenerators/LayeredMeshGenerator.cpp
+++ b/MeshLib/MeshGenerators/LayeredMeshGenerator.cpp
@@ -33,8 +33,8 @@ LayeredMeshGenerator::LayeredMeshGenerator()
 {
 }
 
-bool LayeredMeshGenerator::createLayers(MeshLib::Mesh const& mesh, 
-                                        std::vector<std::string> const& raster_paths, 
+bool LayeredMeshGenerator::createLayers(MeshLib::Mesh const& mesh,
+                                        std::vector<std::string> const& raster_paths,
                                         double minimum_thickness,
                                         double noDataReplacementValue)
 {
@@ -73,9 +73,9 @@ double LayeredMeshGenerator::calcEpsilon(GeoLib::Raster const& low, GeoLib::Rast
     return ((max-min)*1e-07);
 }
 
-MeshLib::Node* LayeredMeshGenerator::getNewLayerNode(MeshLib::Node const& dem_node, 
-                                                     MeshLib::Node const& last_layer_node, 
-                                                     GeoLib::Raster const& raster, 
+MeshLib::Node* LayeredMeshGenerator::getNewLayerNode(MeshLib::Node const& dem_node,
+                                                     MeshLib::Node const& last_layer_node,
+                                                     GeoLib::Raster const& raster,
                                                      std::size_t new_node_id) const
 {
     double const elevation = std::min(raster.interpolateValueAtPoint(dem_node), dem_node[2]);
diff --git a/MeshLib/MeshGenerators/LayeredMeshGenerator.h b/MeshLib/MeshGenerators/LayeredMeshGenerator.h
index 152ea3ec3ccc219affa4c796cc1cc83edf48be02..ec832bc47462029d2bc1185a5c9c84bb7a8e7ecf 100644
--- a/MeshLib/MeshGenerators/LayeredMeshGenerator.h
+++ b/MeshLib/MeshGenerators/LayeredMeshGenerator.h
@@ -43,9 +43,9 @@ public:
 	* @param noDataReplacementValue  Default z-coordinate if there are mesh nodes not located on the DEM raster (i.e. raster_paths[0])
 	* @result true if the subsurface representation has been created, false if there was an error
 	*/
-	virtual bool createLayers(MeshLib::Mesh const& mesh, 
-	                          std::vector<std::string> const& raster_paths, 
-	                          double minimum_thickness, 
+	virtual bool createLayers(MeshLib::Mesh const& mesh,
+	                          std::vector<std::string> const& raster_paths,
+	                          double minimum_thickness,
 	                          double noDataReplacementValue = 0.0) final;
 
 	/**
@@ -56,9 +56,9 @@ public:
 	* @param noDataReplacementValue  Default z-coordinate if there are mesh nodes not located on the DEM raster (i.e. raster_paths[0])
 	* @result true if the subsurface representation has been created, false if there was an error
 	*/
-	virtual bool createRasterLayers(MeshLib::Mesh const& mesh, 
-	                                std::vector<GeoLib::Raster const*> const& rasters, 
-	                                double minimum_thickness, 
+	virtual bool createRasterLayers(MeshLib::Mesh const& mesh,
+	                                std::vector<GeoLib::Raster const*> const& rasters,
+	                                double minimum_thickness,
 	                                double noDataReplacementValue) = 0;
 
 	/// Returns a mesh of the subsurface representation
diff --git a/MeshLib/MeshGenerators/LayeredVolume.h b/MeshLib/MeshGenerators/LayeredVolume.h
index 093369156cf9c05f6d5ab72aa249050c01e4c492..1f6a76fa8f73311fee6e5b7f45b093dd6997edc8 100644
--- a/MeshLib/MeshGenerators/LayeredVolume.h
+++ b/MeshLib/MeshGenerators/LayeredVolume.h
@@ -43,9 +43,9 @@ public:
 	 * @param noDataReplacementValue  Default z-coordinate if there are mesh nodes not located on the DEM raster (i.e. raster_paths[0])
 	 * @result true if the subsurface representation has been created, false if there was an error
 	 */
-	bool createRasterLayers(const MeshLib::Mesh &mesh, 
-	                        const std::vector<GeoLib::Raster const*> &rasters, 
-	                        double minimum_thickness, 
+	bool createRasterLayers(const MeshLib::Mesh &mesh,
+	                        const std::vector<GeoLib::Raster const*> &rasters,
+	                        double minimum_thickness,
 	                        double noDataReplacementValue = 0.0);
 
 	/// Returns the region attribute vector necessary for assigning region attributes via TetGen
diff --git a/MeshLib/MeshGenerators/MeshLayerMapper.h b/MeshLib/MeshGenerators/MeshLayerMapper.h
index 46f9188ba6571b2e08f2408cbcb92eaf785360c3..b2d7df8880e1deb42dfbfbf6e45077ab5a1017fc 100644
--- a/MeshLib/MeshGenerators/MeshLayerMapper.h
+++ b/MeshLib/MeshGenerators/MeshLayerMapper.h
@@ -47,12 +47,12 @@ public:
 	* \param mesh                    The 2D triangle mesh that is the basis for the new 3D prism mesh
 	* \param rasters                 Containing all the raster-data for the subsurface layers from bottom to top (starting with the bottom of the oldest layer and ending with the DEM)
 	* \param minimum_thickness       Minimum thickness of each of the newly created layers (i.e. nodes with a vertical distance smaller than this will be collapsed)
-	* \param noDataReplacementValue  Default z-coordinate if there are mesh nodes not located on the DEM raster (i.e. raster_paths[0]) 
+	* \param noDataReplacementValue  Default z-coordinate if there are mesh nodes not located on the DEM raster (i.e. raster_paths[0])
 	* \return A mesh with the requested number of layers of prism elements (also including Tet- & Pyramid-elements in case of degenerated prisms)
 	*/
-	bool createRasterLayers(MeshLib::Mesh const& mesh, 
-	                        std::vector<GeoLib::Raster const*> const& rasters, 
-	                        double minimum_thickness, 
+	bool createRasterLayers(MeshLib::Mesh const& mesh,
+	                        std::vector<GeoLib::Raster const*> const& rasters,
+	                        double minimum_thickness,
 	                        double noDataReplacementValue = 0.0);
 
 	/**
@@ -62,7 +62,7 @@ public:
 	static bool layerMapping(MeshLib::Mesh &mesh, const std::string &rasterfile, double noDataReplacementValue);
 
 	/**
-	* Maps the elevation of nodes of a given 2D mesh according to the raster. At locations wher no 
+	* Maps the elevation of nodes of a given 2D mesh according to the raster. At locations wher no
 	* information is given, node elevation is set to noDataReplacementValue.
 	*/
 	static bool layerMapping(MeshLib::Mesh &mesh, const GeoLib::Raster &raster, double noDataReplacementValue);
diff --git a/MeshLib/MeshQuality/AngleSkewMetric.h b/MeshLib/MeshQuality/AngleSkewMetric.h
index 924a8f0edf11746ee7e4d4f188b0c2257bd64abb..c7989cb1ab9c6227913f39f8dd16653a44660972 100644
--- a/MeshLib/MeshQuality/AngleSkewMetric.h
+++ b/MeshLib/MeshQuality/AngleSkewMetric.h
@@ -20,7 +20,7 @@
 namespace MeshLib
 {
 
-/** 
+/**
  * Calculates the quality of mesh elements based on the EquiAngleSkew measure
  */
 class AngleSkewMetric : public ElementQualityMetric
diff --git a/MeshLib/MeshQuality/ElementErrorCode.h b/MeshLib/MeshQuality/ElementErrorCode.h
index 2306097538e5250ae14b94f1599a5435518a7c0a..b7e29b8d9c0dec936bae950674eea8fbe282d516 100644
--- a/MeshLib/MeshQuality/ElementErrorCode.h
+++ b/MeshLib/MeshQuality/ElementErrorCode.h
@@ -20,7 +20,7 @@
 
 
 /// Possible error flags for mesh elements
-enum class ElementErrorFlag 
+enum class ElementErrorFlag
 {
 	ZeroVolume,
 	NonCoplanar,
@@ -35,7 +35,7 @@ class ElementErrorCode : public std::bitset<static_cast<std::size_t>(ElementErro
 {
 public:
 	ElementErrorCode() {}
-	//ElementErrorCode(std::bitset< static_cast<std::size_t>(ElementErrorFlag::MaxValue) > error_flags) 
+	//ElementErrorCode(std::bitset< static_cast<std::size_t>(ElementErrorFlag::MaxValue) > error_flags)
 	//	: _errors(error_flags) {}
 
 	~ElementErrorCode() {}
@@ -46,7 +46,7 @@ public:
 	void set(ElementErrorFlag e) { std::bitset<static_cast<std::size_t>(ElementErrorFlag::MaxValue)>::set(static_cast<std::size_t>(e), true); }
 	/// Reset a specific flag
 	void reset(ElementErrorFlag e) { std::bitset<static_cast<std::size_t>(ElementErrorFlag::MaxValue)>::set(static_cast<std::size_t>(e), false); }
-	
+
 	inline reference operator[](const ElementErrorFlag e) { return std::bitset<static_cast<std::size_t>(ElementErrorFlag::MaxValue)>::operator[](static_cast<std::size_t>(e)); }
 	inline bool operator[](const ElementErrorFlag e) const { return std::bitset<static_cast<std::size_t>(ElementErrorFlag::MaxValue)>::operator[](static_cast<std::size_t>(e)); }
 
@@ -61,7 +61,7 @@ public:
 			return "non-convex geometry";
 		else if (e == ElementErrorFlag::NodeOrder)
 			return "wrong node order";
-		return "nonspecified error"; 
+		return "nonspecified error";
 	}
 
 private:
diff --git a/MeshLib/MeshQuality/ElementQualityInterface.h b/MeshLib/MeshQuality/ElementQualityInterface.h
index 0513000f940aee9c19b7f02fd1f321bdd3ac742a..0857e7b47125c3b2f6a39996fc3b2e2f956eb7ac 100644
--- a/MeshLib/MeshQuality/ElementQualityInterface.h
+++ b/MeshLib/MeshQuality/ElementQualityInterface.h
@@ -44,9 +44,9 @@ public:
 	}
 
 	/// Destructor
-	~ElementQualityInterface() 
-	{ 
-		delete _quality_tester; 
+	~ElementQualityInterface()
+	{
+		delete _quality_tester;
 	}
 
 	/// Returns the vector containing a quality measure for each element.
@@ -80,7 +80,7 @@ public:
 		histogram.write(file_name, _mesh.getName(), MeshQualityType2String(_type));
 		return 0;
 	}
-	
+
 private:
 	/// Calculates the quality of each mesh element based on the specified metric
 	void calculateElementQuality(MeshLib::Mesh const& mesh, MeshQualityType t)
diff --git a/MeshLib/MeshQuality/ElementQualityMetric.h b/MeshLib/MeshQuality/ElementQualityMetric.h
index 52dba00b8ba4fabb858ebc58e304474c75d3f267..a9756e77867a87b5e9ff45fb5ef801294942d084 100644
--- a/MeshLib/MeshQuality/ElementQualityMetric.h
+++ b/MeshLib/MeshQuality/ElementQualityMetric.h
@@ -39,16 +39,16 @@ public:
 
 	/// Calculates the quality metric for each element of the mesh
 	virtual void calculateQuality () = 0;
-	
+
 	/// Returns the result vector
 	std::vector<double> const& getElementQuality () const;
-	
+
 	/// Returns the minimum calculated value
 	double getMinValue() const;
-	
+
 	/// Returns the maximum calculated value
 	double getMaxValue() const;
-	
+
 	/// Returns a histogram of the quality vector seperated into the given number of bins.
 	/// If no number of bins is specified, one will be calculated based on the Sturges criterium.
 	virtual BaseLib::Histogram<double> getHistogram (std::size_t n_bins = 0) const;
diff --git a/MeshLib/MeshQuality/ElementSizeMetric.h b/MeshLib/MeshQuality/ElementSizeMetric.h
index 2a3c2d62a4003dc027137d98b81e777d398ed04e..13de8ce00fb2e2f72e175be3b6f8f9a165d9631f 100644
--- a/MeshLib/MeshQuality/ElementSizeMetric.h
+++ b/MeshLib/MeshQuality/ElementSizeMetric.h
@@ -20,7 +20,7 @@
 namespace MeshLib
 {
 
-/** 
+/**
  * Calculates the quality of mesh elements based on length/area/volume
  */
 class ElementSizeMetric : public ElementQualityMetric
diff --git a/MeshLib/MeshQuality/MeshValidation.cpp b/MeshLib/MeshQuality/MeshValidation.cpp
index e333ca8b89d66ab37f3d8b924ee1a60083900255..ffdea09834521d5df0f2f90c3b53eb3367df9141 100644
--- a/MeshLib/MeshQuality/MeshValidation.cpp
+++ b/MeshLib/MeshQuality/MeshValidation.cpp
@@ -142,7 +142,7 @@ unsigned MeshValidation::detectHoles(MeshLib::Mesh const& mesh)
 	delete boundary_mesh;
 
 	// Subtract "1" from the number of surfaces found to get the number of holes.
-	return (--current_surface_id); 
+	return (--current_surface_id);
 }
 
 void MeshValidation::trackSurface(MeshLib::Element const* element, std::vector<unsigned> &sfc_idx, unsigned const current_index)
diff --git a/MeshLib/MeshQuality/MeshValidation.h b/MeshLib/MeshQuality/MeshValidation.h
index d57e1138832cc5b40dd36e7d0bbbed0816c86b1b..337b1ac84af8e335cf5726f3c804415f1a990de6 100644
--- a/MeshLib/MeshQuality/MeshValidation.h
+++ b/MeshLib/MeshQuality/MeshValidation.h
@@ -43,20 +43,20 @@ public:
 	 * @return Vector of error codes for each mesh element
 	 */
 	static std::vector<ElementErrorCode> testElementGeometry(
-		const MeshLib::Mesh &mesh, 
+		const MeshLib::Mesh &mesh,
 		double min_volume = std::numeric_limits<double>::epsilon());
 
-	/** 
+	/**
 	 * Detailed output which ElementID is associated with which error(s)
 	 * @return String containing the report
 	 */
 	static std::array<std::string, static_cast<std::size_t>(ElementErrorFlag::MaxValue)>
 		ElementErrorCodeOutput(const std::vector<ElementErrorCode> &error_codes);
 
-	/** 
-	 * Tests if holes are located within the mesh. 
+	/**
+	 * Tests if holes are located within the mesh.
 	 * In this context, a hole is a boundary of an element with no neighbor that cannot be reached from
-	 * the actual boundary of the mesh. Examples include a missing triangle in a 2D mesh or a missing 
+	 * the actual boundary of the mesh. Examples include a missing triangle in a 2D mesh or a missing
 	 * Tetrahedron in a 3D mesh.
 	 * Note, that this method does not work when complex 3D structures are build from 2D mesh elements,
 	 * e.g. using the LayeredVolume-class, where more than two 2D elements may share an edge.
@@ -66,7 +66,7 @@ public:
 	static unsigned detectHoles(MeshLib::Mesh const& mesh);
 
 private:
-	/** Finds all surface elements that can be reached from element. All elements that are found in this 
+	/** Finds all surface elements that can be reached from element. All elements that are found in this
 	 * way are marked in the global sfc_idx vector using the current_index.
 	 * @param element The mesh element from which the search is started
 	 * @param sfc_idx The global index vector notifying to which surface elements belong
diff --git a/MeshLib/MeshQuality/RadiusEdgeRatioMetric.h b/MeshLib/MeshQuality/RadiusEdgeRatioMetric.h
index a7b5d042a3bead6dd54c35ce2c7dff4e614b20c2..ad173f3e9b001594a2ccd39d7bbbe867f1441655 100644
--- a/MeshLib/MeshQuality/RadiusEdgeRatioMetric.h
+++ b/MeshLib/MeshQuality/RadiusEdgeRatioMetric.h
@@ -20,7 +20,7 @@
 namespace MeshLib
 {
 
-/** 
+/**
  * Calculates the quality of mesh elements based on the ratio between
  * radius of the smallest enclosing sphere and the shortest element edge
  */
diff --git a/Tests/GeoLib/TestGEOObjectsMerge.cpp b/Tests/GeoLib/TestGEOObjectsMerge.cpp
index a552c630f6a18714e990a492582a8f38a6f06f38..a8212d5daa9a342944c3e3d3cbfb925012faf27d 100644
--- a/Tests/GeoLib/TestGEOObjectsMerge.cpp
+++ b/Tests/GeoLib/TestGEOObjectsMerge.cpp
@@ -2,7 +2,7 @@
  * @file TestGEOObjectsMerge.cpp
  * @author Thomas Fischer
  * @date May 21, 2013
- * @brief 
+ * @brief
  *
  * @copyright
  * Copyright (c) 2012-2015, OpenGeoSys Community (http://www.opengeosys.org)
diff --git a/Tests/GeoLib/TestOctTree.cpp b/Tests/GeoLib/TestOctTree.cpp
index 939a643d831735996be24d886e414c23e4319f1f..9229bee20d948296458a0de1cdcd8fc6092441cc 100644
--- a/Tests/GeoLib/TestOctTree.cpp
+++ b/Tests/GeoLib/TestOctTree.cpp
@@ -200,7 +200,7 @@ TEST_F(GeoLibOctTree, TestWithEquidistantPoints3d)
 	result.clear();
 	oct_tree->getPointsInRange(range_query_ll, range_query_ur, result);
 	ASSERT_EQ(static_cast<std::size_t>(9), result.size());
-	
+
 	// insert all points with z = -5.0 - this does not result in a further
 	// refinement of SWL
 	for (std::size_t k(25); k<121; ++k)
diff --git a/Tests/MathLib/TestDenseGaussAlgorithm.cpp b/Tests/MathLib/TestDenseGaussAlgorithm.cpp
index 9532b1fc12a3d9f0b5740ac137da7adb5ddae734..ad826c2db3fb49ad1c672d6740c6480d4a1da863 100644
--- a/Tests/MathLib/TestDenseGaussAlgorithm.cpp
+++ b/Tests/MathLib/TestDenseGaussAlgorithm.cpp
@@ -2,7 +2,7 @@
  * @file TestDenseGaussAlgorithm.cpp
  * @author Thomas Fischer
  * @date Jun 17, 2013
- * @brief 
+ * @brief
  *
  * @copyright
  * Copyright (c) 2012-2015, OpenGeoSys Community (http://www.opengeosys.org)
diff --git a/Tests/MathLib/TestGlobalDenseMatrix.cpp b/Tests/MathLib/TestGlobalDenseMatrix.cpp
index ab1750356579bfb007be5694bba24139edd3c070..90d3139f52ff0205acdde09eea5190104cf30daa 100644
--- a/Tests/MathLib/TestGlobalDenseMatrix.cpp
+++ b/Tests/MathLib/TestGlobalDenseMatrix.cpp
@@ -2,7 +2,7 @@
  * @file TestGlobalDenseMatrix.cpp
  * @author Thomas Fischer
  * @date Jun 5, 2013
- * @brief 
+ * @brief
  *
  * @copyright
  * Copyright (c) 2012-2015, OpenGeoSys Community (http://www.opengeosys.org)
diff --git a/Tests/MathLib/TestLinearSolver.cpp b/Tests/MathLib/TestLinearSolver.cpp
index 1bd38d805ec062b2a96bec0559627be5542f249c..61e432e1257f5ab59b4bc698a29f5315f4b31098 100644
--- a/Tests/MathLib/TestLinearSolver.cpp
+++ b/Tests/MathLib/TestLinearSolver.cpp
@@ -190,11 +190,11 @@ void checkLinearSolverInterface(T_MATRIX &A, T_VECTOR &b, const std::string &pre
     // solve
     T_LINEAR_SOVLER ls(A, prefix_name);
     EXPECT_TRUE(ls.solve(b, x));
-    
+
     EXPECT_GT(ls.getNumberOfIterations(), 0u);
-    
+
     x.getGlobalVector(x1);
-    ASSERT_ARRAY_NEAR(x0, x1, 6, 1e-5);        
+    ASSERT_ARRAY_NEAR(x0, x1, 6, 1e-5);
 }
 #endif
 
diff --git a/Tests/MathLib/TestMatrixAssemblyTemplate.cpp b/Tests/MathLib/TestMatrixAssemblyTemplate.cpp
index 76162ce3419d0c702a74b43815d8dd7d080a3f26..d9f9043fdf54a07343b2a45f69a11ae130e8957a 100644
--- a/Tests/MathLib/TestMatrixAssemblyTemplate.cpp
+++ b/Tests/MathLib/TestMatrixAssemblyTemplate.cpp
@@ -2,7 +2,7 @@
  * @file TestMatrixAssemblyTemplate.cpp
  * @author Thomas Fischer
  * @date Jun 13, 2013
- * @brief 
+ * @brief
  *
  * @copyright
  * Copyright (c) 2012-2015, OpenGeoSys Community (http://www.opengeosys.org)
diff --git a/scripts/cmake/MSVCPaths.cmake b/scripts/cmake/MSVCPaths.cmake
index 36092706fc814ef76db851b1032a80b0bd6575a6..87c2f7d396dea7ac9d9f04d1508c1f0f95a2c7e1 100644
--- a/scripts/cmake/MSVCPaths.cmake
+++ b/scripts/cmake/MSVCPaths.cmake
@@ -14,7 +14,7 @@ if(MSVC)
 	endif()
 	get_filename_component(VS_DIR "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\${MSVC_NUMBER}\\Setup\\VS;ProductDir]" REALPATH)
 	get_filename_component(VS_EXPRESS_DIR "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VCExpress\\${MSVC_NUMBER}\\Setup\\VS;ProductDir]" REALPATH)
-	
+
 	set(X86_TMP "ProgramFiles(x86)")
 	set(MSVC_INSTALL_PATHS
 		${VS_DIR} ${VS_EXPRESS_DIR}
diff --git a/scripts/cmake/cmake/DisableCompilerFlag.cmake b/scripts/cmake/cmake/DisableCompilerFlag.cmake
index dda3dc7041bdf57f494900592f6dde972c4868ad..4b7da074da93d364311d55da69db59cc81a8283e 100644
--- a/scripts/cmake/cmake/DisableCompilerFlag.cmake
+++ b/scripts/cmake/cmake/DisableCompilerFlag.cmake
@@ -6,7 +6,7 @@
 # The Configuration must be uppercased.
 #
 # Usage:
-# 
+#
 #   include(DisableCompilerFlag)
 #   if (MSVC)
 #     DisableCompilerFlag(DEBUG /RTC1)
diff --git a/scripts/cmake/cmake/FindLIS.cmake b/scripts/cmake/cmake/FindLIS.cmake
index 336d04c259fa1565ac525a90611b4a40d5b9d41b..2a778b7f1274cf9134f59f645e8397acb12dfbb9 100644
--- a/scripts/cmake/cmake/FindLIS.cmake
+++ b/scripts/cmake/cmake/FindLIS.cmake
@@ -6,7 +6,7 @@
 #  LIS_LIBRARIES
 #
 #  Environment variable LIS_ROOT_DIR can be set to give hints
-	
+
 find_path( LIS_INCLUDE_DIR lis.h
 	PATHS ENV LIS_ROOT_DIR
 	PATH_SUFFIXES include
diff --git a/scripts/cmake/cmake/FindMSVCRedist.cmake b/scripts/cmake/cmake/FindMSVCRedist.cmake
index 4331268e9a16aaba8ab3c43098743c2b10f6f33f..63cc78838348bb62b3c7be261c04a96c26878af2 100644
--- a/scripts/cmake/cmake/FindMSVCRedist.cmake
+++ b/scripts/cmake/cmake/FindMSVCRedist.cmake
@@ -8,7 +8,7 @@ if (MSVC)
   if (MSVC10)
 	set(VCVERS 10)
   endif()
-  
+
   if(CMAKE_CL_64)
     #if(MSVC_VERSION GREATER 1599)
       # VS 10 and later:
@@ -20,7 +20,7 @@ if (MSVC)
   else()
     set(CMAKE_MSVC_ARCH x86)
   endif()
-  
+
   set(SDKVERS "2.0")
   if(${VCVERS} EQUAL 8)
     set(SDKVERS "2.0")
diff --git a/scripts/cmake/cmake/FindOpenSGSupportlibs.cmake b/scripts/cmake/cmake/FindOpenSGSupportlibs.cmake
index ce56d522d99fe8a37b823c68f52c6a287c1d9b28..2a4fe59c77bba770013bd831f7141d9ffa04d828 100644
--- a/scripts/cmake/cmake/FindOpenSGSupportlibs.cmake
+++ b/scripts/cmake/cmake/FindOpenSGSupportlibs.cmake
@@ -8,7 +8,7 @@
 if (NOT OpenSGSupportlibs_FOUND)
 
 	include(LibFindMacros)
-	
+
 	# Visual Studio x32
 	if (VS32)
 	  # Visual Studio x32
@@ -20,9 +20,9 @@ if (NOT OpenSGSupportlibs_FOUND)
 	  find_library(OpenSGSupportlibs_LIBRARY
 		NAMES glut32 libjpg libpng tif32 zlib
 		PATHS ${LIBRARIES_DIR}/supportlibs/lib
-		  ${CMAKE_SOURCE_DIR}/../supportlibs/lib )  
-	else ()  
-	  if (VS64) 
+		  ${CMAKE_SOURCE_DIR}/../supportlibs/lib )
+	else ()
+	  if (VS64)
 	    # Visual Studio x64
 		find_path( OpenSGSupportlibs_INCLUDE_DIR
 	    NAMES zlib.h
@@ -41,5 +41,5 @@ if (NOT OpenSGSupportlibs_FOUND)
 	set(OpenSGSupportlibs_PROCESS_INCLUDES OpenSGSupportlibs_INCLUDE_DIR)
 	set(OpenSGSupportlibs_PROCESS_LIBS OpenSGSupportlibs_LIBRARY)
 	libfind_process(OpenSGSupportlibs)
-	
+
 endif ()
\ No newline at end of file
diff --git a/scripts/cmake/cmake/FindQVTK.cmake b/scripts/cmake/cmake/FindQVTK.cmake
index 51d363ae4bcc55c6abc99481d7b177194409cf5e..e3cdd73e095947bbffae9ad92707d1cf2c0a1469 100644
--- a/scripts/cmake/cmake/FindQVTK.cmake
+++ b/scripts/cmake/cmake/FindQVTK.cmake
@@ -6,8 +6,8 @@
 #   QVTK_FOUND       - True if QVTK was found
 #   QVTK_INCLUDE_DIR - Directory containing the QVTK include files
 #   QVTK_LIBRARY     - QVTK library
-# 
-# If QVTK_FOUND then QVTK_INCLUDE_DIR is appended to VTK_INCLUDE_DIRS and 
+#
+# If QVTK_FOUND then QVTK_INCLUDE_DIR is appended to VTK_INCLUDE_DIRS and
 # QVTK_LIBRARY is appended to QVTK_LIBRARY_DIR.
 #
 
diff --git a/scripts/cmake/cmake/Findcutil.cmake b/scripts/cmake/cmake/Findcutil.cmake
index a7c0340390ff3f4716204b04d42c2a7584b5722c..b38712d6ec7eb5a029ef68d909f610b2372a8686 100644
--- a/scripts/cmake/cmake/Findcutil.cmake
+++ b/scripts/cmake/cmake/Findcutil.cmake
@@ -31,11 +31,11 @@ endif()
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(cutil DEFAULT_MSG CUDA_SDK_ROOT_DIR CUDA_FOUND)
 
-if(CUTIL_FOUND)	
+if(CUTIL_FOUND)
 	get_filename_component(_moddir "${CMAKE_CURRENT_LIST_FILE}" PATH)
 	add_subdirectory("${_moddir}/nested_targets/cutil")
-	
-	
+
+
 	function(install_cutil dest)
 		install(TARGETS cutil
 			RUNTIME DESTINATION "${dest}"
diff --git a/scripts/cmake/cmake/OptionRequires.cmake b/scripts/cmake/cmake/OptionRequires.cmake
index dafbf376a04b1782fd60c69d2f048f009c8fa040..35ddf14cae50744bd0b034bba0e744b4d1e854b1 100644
--- a/scripts/cmake/cmake/OptionRequires.cmake
+++ b/scripts/cmake/cmake/OptionRequires.cmake
@@ -21,7 +21,7 @@ function(option_requires name desc)
 		list(REMOVE_AT args ${_off_found})
 		set(OFF_BY_DEFAULT true)
 	endif()
-	
+
 	set(found)
 	set(missing)
 	foreach(var ${args})
@@ -31,20 +31,20 @@ function(option_requires name desc)
 			list(APPEND missing ${var})
 		endif()
 	endforeach()
-	
+
 	if(NOT missing)
 		set(OK TRUE)
 	else()
 		set(OK FALSE)
 	endif()
-	
+
 	set(default ${OK})
 	if(OFF_BY_DEFAULT)
 		set(default OFF)
 	endif()
-	
+
 	option(${name} "${desc}" ${default})
-	
+
 	if(${name} AND (NOT OK))
 		message(FATAL_ERROR "${name} enabled but these dependencies were not valid: ${missing}")
 	endif()
diff --git a/scripts/cmake/cmake/README.md b/scripts/cmake/cmake/README.md
index e14001696934fe121fa9d9cd0569b5514216e8ad..e76e98343e8b8b27e5e9d30571e7c857a5163b92 100644
--- a/scripts/cmake/cmake/README.md
+++ b/scripts/cmake/cmake/README.md
@@ -31,7 +31,7 @@ For updates:
 For pushing to upstream:
 
 	cd projectdir
-	
+
 	git subtree push --prefix=cmake git@github.com:bilke/cmake-modules.git master