Attempting to un-fark my develop branch.
Merge branch 'develop' of https://github.com/spanky762/org.openntf.domino into develop

Conflicts:
	NOTICE.md
	demoDb/.metadata/WebContent/WEB-INF/faces-config.pageflow
	demoDb/.project
	demoDb/.settings/.jsdtscope
	demoDb/.settings/org.eclipse.core.resources.prefs
	demoDb/.settings/org.eclipse.jdt.core.prefs
	demoDb/.settings/org.eclipse.wst.common.component
	demoDb/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
	demoDb/.settings/org.eclipse.wst.common.project.facet.core.xml
	demoDb/AppProperties/xspdesign.properties
	demoDb/Code/ScriptLibraries/SSJS_SL.jss
	demoDb/Code/ScriptLibraries/SSJS_SL.jss.metadata
	demoDb/CustomControls/LeftAdmin.xsp
	demoDb/CustomControls/LeftAdmin.xsp.metadata
	demoDb/CustomControls/LeftCore.xsp
	demoDb/CustomControls/LeftCore.xsp.metadata
	demoDb/CustomControls/LeftDatabase.xsp
	demoDb/CustomControls/LeftDatabase.xsp.metadata
	demoDb/CustomControls/LeftDateTime.xsp
	demoDb/CustomControls/LeftDateTime.xsp.metadata
	demoDb/CustomControls/LeftDocument.xsp
	demoDb/CustomControls/LeftDocument.xsp.metadata
	demoDb/CustomControls/LeftHelper.xsp
	demoDb/CustomControls/LeftHelper.xsp.metadata
	demoDb/CustomControls/LeftName.xsp
	demoDb/CustomControls/LeftName.xsp.metadata
	demoDb/CustomControls/LeftView.xsp
	demoDb/CustomControls/LeftView.xsp.metadata
	demoDb/CustomControls/LeftXots.xsp
	demoDb/CustomControls/LeftXots.xsp.metadata
	demoDb/CustomControls/MethodComparator.xsp.metadata
	demoDb/CustomControls/ccLayoutOneUI.xsp.metadata
	demoDb/CustomControls/docScanner.xsp
	demoDb/CustomControls/docScanner.xsp.metadata
	demoDb/CustomControls/mainArea.xsp
	demoDb/CustomControls/mainArea.xsp.metadata
	demoDb/Resources/Files/prettify.css.metadata
	demoDb/Resources/Files/prettify.js.metadata
	demoDb/Resources/Images/intec-logo-medium1.gif.metadata
	demoDb/Resources/StyleSheets/styles.css
	demoDb/Resources/StyleSheets/styles.css.metadata
	demoDb/Resources/Themes/appTheme.theme
	demoDb/Resources/Themes/appTheme.theme.metadata
	demoDb/WebContent/META-INF/MANIFEST.MF
	demoDb/WebContent/WEB-INF/.classpath
	demoDb/WebContent/WEB-INF/.gitignore
	demoDb/WebContent/WEB-INF/.project
	demoDb/WebContent/WEB-INF/src/extlib/DataInitializer.java
	demoDb/WebContent/WEB-INF/src/extlib/DataInitializerOpenNTF.java
	demoDb/WebContent/WEB-INF/src/extlib/SampleDataUtil.java
	demoDb/WebContent/WEB-INF/src/name/fraser/neil/plaintext/diff_match_patch.java
	demoDb/WebContent/WEB-INF/src/org/openntf/domino/xotsTests/XotsBasic.java
	demoDb/WebContent/WEB-INF/src/org/openntf/domino/xotsTests/XotsCustomEvent.java
	demoDb/WebContent/WEB-INF/src/org/openntf/domino/xotsTests/XotsScheduledBasic.java
	demoDb/WebContent/WEB-INF/src/org/openntf/dominoTests/DataInitializer
	demoDb/WebContent/WEB-INF/src/org/openntf/dominoTests/DataInitializerComparator.java
	demoDb/WebContent/WEB-INF/src/org/openntf/dominoTests/DataInitializerOpenNTF
	demoDb/WebContent/WEB-INF/src/org/openntf/dominoTests/ExtendedDumpVisitor.java
	demoDb/WebContent/WEB-INF/src/org/openntf/dominoTests/NewDatabaseBean.java
	demoDb/WebContent/WEB-INF/src/org/openntf/dominoTests/NewDateTimeBean
	demoDb/WebContent/WEB-INF/src/org/openntf/dominoTests/NewDateTimeBean.java
	demoDb/WebContent/WEB-INF/src/org/openntf/dominoTests/NewDocumentBean
	demoDb/WebContent/WEB-INF/src/org/openntf/dominoTests/NewDocumentBean.java
	demoDb/WebContent/WEB-INF/src/org/openntf/dominoTests/NewHelperBean.java
	demoDb/WebContent/WEB-INF/src/org/openntf/dominoTests/NewNameBean.java
	demoDb/WebContent/WEB-INF/src/org/openntf/dominoTests/NewViewBean
	demoDb/WebContent/WEB-INF/src/org/openntf/dominoTests/NewViewBean.java
	demoDb/WebContent/WEB-INF/src/org/openntf/dominoTests/OldDateTimeBean
	demoDb/WebContent/WEB-INF/src/org/openntf/dominoTests/OldDateTimeBean.java
	demoDb/WebContent/WEB-INF/src/org/openntf/dominoTests/OldDocumentBean
	demoDb/WebContent/WEB-INF/src/org/openntf/dominoTests/OldDocumentBean.java
	demoDb/WebContent/WEB-INF/src/org/openntf/dominoTests/OldViewBean
	demoDb/WebContent/WEB-INF/src/org/openntf/dominoTests/OldViewBean.java
	demoDb/WebContent/WEB-INF/src/org/openntf/dominoTests/SpecificMethodVisitor.java
	demoDb/WebContent/WEB-INF/src/org/openntf/dominoTests/TestDocumentListener.java
	demoDb/WebContent/WEB-INF/src/org/openntf/dominoTests/Utils.java
	demoDb/WebContent/WEB-INF/web.xml
	demoDb/WebContent/WEB-INF/xsp.properties
	demoDb/XPages/Admin_DataInitializerComparator.xsp.metadata
	demoDb/XPages/Admin_Home.xsp.metadata
	demoDb/XPages/Database_ApiPath.xsp
	demoDb/XPages/Database_ApiPath.xsp.metadata
	demoDb/XPages/Database_GetByApiPath.xsp
	demoDb/XPages/Database_GetByApiPath.xsp.metadata
	demoDb/XPages/Database_GetByMetaReplicaID.xsp
	demoDb/XPages/Database_GetByMetaReplicaID.xsp.metadata
	demoDb/XPages/Database_MetaReplicaID.xsp
	demoDb/XPages/Database_MetaReplicaID.xsp.metadata
	demoDb/XPages/DateTime.xsp.metadata
	demoDb/XPages/DateTime_Equals.xsp.metadata
	demoDb/XPages/DateTime_EqualsIgnoreDate.xsp.metadata
	demoDb/XPages/DateTime_EqualsIgnoreTime.xsp.metadata
	demoDb/XPages/DateTime_GetDate.xsp.metadata
	demoDb/XPages/DateTime_IsAfter.xsp.metadata
	demoDb/XPages/DateTime_IsAnyDate.xsp.metadata
	demoDb/XPages/DateTime_IsBefore.xsp.metadata
	demoDb/XPages/Document_BreakNames.xsp.metadata
	demoDb/XPages/Document_Create_Map.xsp
	demoDb/XPages/Document_Create_Map.xsp.metadata
	demoDb/XPages/Document_Create_Pairs.xsp
	demoDb/XPages/Document_Create_Pairs.xsp.metadata
	demoDb/XPages/Document_CreatedDate.xsp
	demoDb/XPages/Document_CreatedDate.xsp.metadata
	demoDb/XPages/Document_CreatedDateOld.xsp
	demoDb/XPages/Document_CreatedDateOld.xsp.metadata
	demoDb/XPages/Document_FieldDate.xsp
	demoDb/XPages/Document_FieldDate.xsp.metadata
	demoDb/XPages/Document_FieldDocumentCollection.xsp
	demoDb/XPages/Document_FieldDocumentCollection.xsp.metadata
	demoDb/XPages/Document_FieldFormula.xsp
	demoDb/XPages/Document_FieldFormula.xsp.metadata
	demoDb/XPages/Document_FieldMap.xsp
	demoDb/XPages/Document_FieldMap.xsp.metadata
	demoDb/XPages/Document_Form.xsp
	demoDb/XPages/Document_Form.xsp.metadata
	demoDb/XPages/Document_FormName.xsp
	demoDb/XPages/Document_FormName.xsp.metadata
	demoDb/XPages/Document_Map1.xsp
	demoDb/XPages/Document_Map1.xsp.metadata
	demoDb/XPages/Document_Map2.xsp
	demoDb/XPages/Document_Map2.xsp.metadata
	demoDb/XPages/Document_OtherDates.xsp
	demoDb/XPages/Document_OtherDates.xsp.metadata
	demoDb/XPages/Document_ReplaceItemValueSummary.xsp
	demoDb/XPages/Document_ReplaceItemValueSummary.xsp.metadata
	demoDb/XPages/Document_TestNamesAuthorsReaders.xsp.metadata
	demoDb/XPages/Document_ToJson.xsp
	demoDb/XPages/Document_ToJson.xsp.metadata
	demoDb/XPages/Error.xsp.metadata
	demoDb/XPages/Home.xsp
	demoDb/XPages/Home.xsp.metadata
	demoDb/XPages/Misc_DatabaseListeners.xsp.metadata
	demoDb/XPages/Misc_DocumentScanner.xsp
	demoDb/XPages/Misc_DocumentScanner.xsp.metadata
	demoDb/XPages/Misc_Exception.xsp
	demoDb/XPages/Misc_Exception.xsp.metadata
	demoDb/XPages/Misc_Exception_OpenLog.xsp
	demoDb/XPages/Misc_Exception_OpenLog.xsp.metadata
	demoDb/XPages/Misc_FormulaParser.xsp
	demoDb/XPages/Misc_FormulaParser.xsp.metadata
	demoDb/XPages/Misc_NSA.xsp.metadata
	demoDb/XPages/Misc_NamePicker.xsp
	demoDb/XPages/Misc_NamePicker.xsp.metadata
	demoDb/XPages/Misc_OtherSessions.xsp.metadata
	demoDb/XPages/Misc_SimpleEmailHelper.xsp
	demoDb/XPages/Misc_SimpleEmailHelper.xsp.metadata
	demoDb/XPages/Misc_SortedCollection.xsp
	demoDb/XPages/Misc_SortedCollection.xsp.metadata
	demoDb/XPages/Misc_SyncHelper.xsp.metadata
	demoDb/XPages/Misc_Transaction.xsp
	demoDb/XPages/Misc_Transaction.xsp.metadata
	demoDb/XPages/Misc_ValuePickers.xsp
	demoDb/XPages/Misc_ValuePickers.xsp.metadata
	demoDb/XPages/Misc_XSPUtils.xsp.metadata
	demoDb/XPages/Name_GetGroups.xsp
	demoDb/XPages/Name_GetGroups.xsp.metadata
	demoDb/XPages/Name_GetNameParts.xsp
	demoDb/XPages/Name_GetNameParts.xsp.metadata
	demoDb/XPages/OpenLogBean.xsp
	demoDb/XPages/OpenLogBean.xsp.metadata
	demoDb/XPages/View_GetAllDocumentsByKey.xsp.metadata
	demoDb/XPages/View_GetAllDocumentsByKeyNoMatch.xsp.metadata
	demoDb/XPages/View_GetAllEntriesByKey.xsp.metadata
	demoDb/XPages/View_GetAllEntriesByKeyNoMatch.xsp.metadata
	demoDb/XPages/View_IndexFlags.xsp.metadata
	demoDb/XPages/View_IsUnique.xsp
	demoDb/XPages/View_IsUnique.xsp.metadata
	demoDb/XPages/View_TimeSensitive.xsp.metadata
	demoDb/XPages/View_ViewEntry.xsp.metadata
	demoDb/XPages/Xots.xsp.metadata
	demoDb/XPages/Xots_Event.xsp.metadata
	demoDb/XPages/test.xsp
	demoDb/XPages/test.xsp.metadata
	org.openntf.domino.plugin/META-INF/MANIFEST.MF
	org.openntf.domino.xsp/doc/index-files/index-14.html
	org.openntf.domino.xsp/doc/index-files/index-15.html
	org.openntf.domino.xsp/doc/index-files/index-16.html
	org.openntf.domino.xsp/doc/index-files/index-6.html
	org.openntf.domino.xsp/doc/index-files/index-7.html
	org.openntf.domino.xsp/doc/org/openntf/domino/xsp/Activator.html
	org.openntf.domino.xsp/doc/org/openntf/domino/xsp/XspLibrary.html
	org.openntf.domino.xsp/doc/org/openntf/domino/xsp/XspOpenLogErrorHolder.html
	org.openntf.domino.xsp/doc/org/openntf/domino/xsp/XspOpenLogPhaseListener.html
	org.openntf.domino.xsp/doc/org/openntf/domino/xsp/class-use/XspOpenLogErrorHolder.EventError.html
	org.openntf.domino.xsp/doc/org/openntf/domino/xsp/components/AdaptiveUIInput.html
	org.openntf.domino.xsp/doc/org/openntf/domino/xsp/components/IAdaptiveContext.ClientType.html
	org.openntf.domino.xsp/doc/org/openntf/domino/xsp/components/IAdaptiveController.html
	org.openntf.domino.xsp/doc/org/openntf/domino/xsp/components/class-use/IAdaptiveContext.ClientType.html
	org.openntf.domino.xsp/doc/org/openntf/domino/xsp/helpers/MapValuePickerData.SearchStyle.html
	org.openntf.domino.xsp/doc/org/openntf/domino/xsp/helpers/MapValuePickerData.SearchType.html
	org.openntf.domino.xsp/doc/org/openntf/domino/xsp/helpers/OpenntfNABNamePickerData.NABDb.html
	org.openntf.domino.xsp/doc/org/openntf/domino/xsp/helpers/OpenntfViewNavigatorEx.html
	org.openntf.domino.xsp/doc/org/openntf/domino/xsp/helpers/OpenntfViewNavigatorFactoryFactory.html
	org.openntf.domino.xsp/doc/org/openntf/domino/xsp/helpers/ServerBean.html
	org.openntf.domino.xsp/doc/org/openntf/domino/xsp/helpers/SimpleNamePickerData.html
	org.openntf.domino.xsp/doc/org/openntf/domino/xsp/helpers/XspUtils.html
	org.openntf.domino.xsp/doc/org/openntf/domino/xsp/helpers/class-use/MapValuePickerData.SearchStyle.html
	org.openntf.domino.xsp/doc/org/openntf/domino/xsp/helpers/class-use/MapValuePickerData.SearchType.html
	org.openntf.domino.xsp/doc/org/openntf/domino/xsp/helpers/package-summary.html
	org.openntf.domino.xsp/doc/org/openntf/domino/xsp/helpers/package-use.html
	org.openntf.domino.xsp/doc/org/openntf/domino/xsp/readers/LogReader.html
	org.openntf.domino.xsp/doc/org/openntf/domino/xsp/script/WrapperOpenDomino.OpenFunction.html
	org.openntf.domino.xsp/doc/org/openntf/domino/xsp/script/WrapperOpenDomino.OpenMethodMap.html
	org.openntf.domino.xsp/doc/org/openntf/domino/xsp/script/WrapperOpenDomino.OpenObject.html
	org.openntf.domino.xsp/doc/org/openntf/domino/xsp/script/WrapperOpenDomino.html
	org.openntf.domino.xsp/doc/org/openntf/domino/xsp/script/package-summary.html
	org.openntf.domino.xsp/doc/org/openntf/domino/xsp/script/package-use.html
	org.openntf.domino.xsp/src/org/openntf/domino/xots/XotsService.java
	org.openntf.domino.xsp/src/org/openntf/domino/xsp/XspOpenLogUtil.java
	org.openntf.domino.xsp/src/org/openntf/domino/xsp/helpers/BackgroundRunnable.java
	org.openntf.domino.xsp/src/org/openntf/domino/xsp/helpers/VariableResolver.java
	org.openntf.domino/src/main/java/org/openntf/domino/events/AbstractDominoEvent.java
	org.openntf.domino/src/main/java/org/openntf/domino/events/EnumEvent.java
	org.openntf.domino/src/main/java/org/openntf/domino/events/GenericDominoEventFactory.java
	org.openntf.domino/src/main/java/org/openntf/domino/events/IDominoEvent.java
	org.openntf.domino/src/main/java/org/openntf/domino/events/IDominoEventFactory.java
	org.openntf.domino/src/main/java/org/openntf/domino/events/IDominoListener.java
	org.openntf.domino/src/main/java/org/openntf/domino/ext/ACL.java
	org.openntf.domino/src/main/java/org/openntf/domino/ext/ACLEntry.java
	org.openntf.domino/src/main/java/org/openntf/domino/ext/AdministrationProcess.java
	org.openntf.domino/src/main/java/org/openntf/domino/ext/Agent.java
	org.openntf.domino/src/main/java/org/openntf/domino/ext/AgentContext.java
	org.openntf.domino/src/main/java/org/openntf/domino/ext/Base.java
	org.openntf.domino/src/main/java/org/openntf/domino/ext/View.java
	org.openntf.domino/src/main/java/org/openntf/domino/logging/IOpenLogItem.java
	org.openntf.domino/src/test/java/org/openntf/domino/tests/paul/ViewCheckUniqueTest.java