Purge unused variable in tutorial 4
Remove trailing whitespaces
Merge pull request #282 from juliohm/master

Remove trailing whitespaces
Merge remote-tracking branch 'upstream/master' into save-eclgrid-after-deactivating-cells

Conflicts:
	opm/core/io/eclipse/EclipseGridParser.cpp
	opm/core/io/eclipse/EclipseGridParser.hpp