merge feature/changesAfter3_0_2; resolve conflicts

exampleDatabase/configure/CONFIG_SITE

@@ -20,5 +20,9 @@ CHECK_RELEASE = WARN
 #   INSTALL_LOCATION here.
 #INSTALL_LOCATION=</path/name/to/install/top>
 
+INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv
+USR_INCLUDES += -I $(INSTALL_LOCATION)/include
+
 -include $(TOP)/../configure/CONFIG_SITE.local
 -include $(TOP)/../../CONFIG_SITE.local
+-include $(TOP)/../CONFIG.local

exampleDatabase/configure/RELEASE

@@ -27,7 +27,7 @@
 # If this example is built in a directory under pvDatabaseCPP,
 # use the following definitions:
 
-PVDATABASETEST = $(TOP)/../testTop
+PVDATABASETEST = $(TOP)/../test
 PVDATABASE = $(TOP)/..
 
 -include $(TOP)/../configure/RELEASE.local