Merge remote-tracking branch 'origin/feature/Testing_WF_Components' into feature/Testing_WF_Plugin
Conflicts:
opennft-xpages-protocol-app/odp/AppProperties/database.properties
openntf-xpages-expenses-demo-app/odp/AppProperties/database.properties
openntf-xpages-expenses-demo-app/odp/Code/Java/org/openntf/wf/demo/api/ExpenseSessionFacade.java.metadata
openntf-xpages-expenses-demo-app/odp/Code/Java/org/openntf/wf/demo/expenses/Expense.java.metadata
openntf-xpages-expenses-demo-app/odp/Code/Java/org/openntf/wf/demo/expenses/ExpenseStorageService.java.metadata
openntf-xpages-expenses-demo-app/odp/CustomControls/ccApplication.xsp.metadata
openntf-xpages-expenses-demo-app/odp/CustomControls/ccMessages.xsp.metadata
openntf-xpages-expenses-demo-app/odp/XPages/Expenses.xsp.metadata