Merge dev into pre-proto

Conflicts:
	ApplicationCode/ProjectDataModel/RimEclipseView.cpp
	ApplicationCode/ProjectDataModel/RimEclipseView.h

ApplicationCode/ProjectDataModel/RimProject.cpp

@@ -23,7 +23,8 @@
 #include "RiaApplication.h"
 #include "RiaVersionInfo.h"
 
-#include "RigCaseData.h"
+#include "RigEclipseCaseData.h"
+#include "RigGridBase.h"
 
 #include "RimCalcScript.h"
 #include "RimCase.h"
@@ -60,6 +61,8 @@
 #include "cafCmdFeatureManager.h"
 #include "cafPdmUiTreeOrdering.h"
 
+#include "cvfBoundingBox.h"
+
 #include <QDir>
 #include <QMenu>