ignore .classpath because that is taken care of by maven
Predicive IDs implemented in the global and transactional caches
Merged Predictive ID refactor with the main branch
Added Metadata to enable and disable Predicitive IDs per type
Removed unused imports
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml
	runwaysdk-browser/runwaysdk-browser-test/.settings/org.eclipse.wst.common.component
	runwaysdk-browser/runwaysdk-browser-test/src/main/domain/application/schema(0001304980087954)MainSchema.xml
	runwaysdk-browser/runwaysdk-browser-test/src/main/java/server/com/runwaysdk/jstest/WaitSecondJob.java
	runwaysdk-browser/runwaysdk-browser-test/src/main/webapp/MasterTestLauncher.jsp
	runwaysdk-browser/runwaysdk-browser-test/src/main/webapp/tests/TestFramework.js
	runwaysdk-browser/runwaysdk-browser-test/src/main/webapp/tests/Test_RunwaySDK_UI.js
	runwaysdk-browser/src/main/javascript/com/runwaysdk/ClassFramework.js
	runwaysdk-browser/src/main/javascript/com/runwaysdk/RunwaySDK_Core.js
	runwaysdk-browser/src/main/javascript/com/runwaysdk/RunwaySDK_DTO.js
	runwaysdk-browser/src/main/javascript/com/runwaysdk/ui/RunwaySDK_UI.js
	runwaysdk-browser/src/main/javascript/com/runwaysdk/ui/datatable/datasource/InstanceQueryDataSource.js
	runwaysdk-browser/src/main/javascript/com/runwaysdk/ui/factory/generic/datatable/Row.js
	runwaysdk-browser/src/main/javascript/com/runwaysdk/ui/factory/generic/datatable/datasource/BaseServerDataSource.js
	runwaysdk-browser/src/main/javascript/com/runwaysdk/ui/factory/generic/datatable/datasource/Events.js
	runwaysdk-browser/src/main/javascript/com/runwaysdk/ui/factory/generic/datatable/datasource/ServerDataSource.js
	runwaysdk-browser/src/main/javascript/com/runwaysdk/ui/factory/jquery/Dialog.js
	runwaysdk-browser/src/main/javascript/com/runwaysdk/ui/factory/jquery/Factory.js
	runwaysdk-browser/src/main/javascript/com/runwaysdk/ui/factory/jquery/datatable/DataTable.js
	runwaysdk-browser/src/main/javascript/com/runwaysdk/ui/factory/jquery/datatable/datasource/ServerDataSource.js
	runwaysdk-browser/src/main/javascript/com/runwaysdk/ui/factory/runway/runway.js
	runwaysdk-browser/src/main/javascript/com/runwaysdk/ui/factory/runway/widget/Widget.js
	runwaysdk-browser/src/main/javascript/com/runwaysdk/ui/factory/yui3/yui3.js
	runwaysdk-browser/src/main/javascript/com/runwaysdk/ui/scheduler/Scheduler.js
	runwaysdk-browser/src/main/javascript/com/runwaysdk/ui/userstable/UsersTable.js
	runwaysdk-client/.settings/org.eclipse.wst.common.component
	runwaysdk-client/src/main/java/com/runwaysdk/system/scheduler/JobHistoryControllerBase.java
	runwaysdk-client/src/test/java/com/runwaysdk/ClientCommonExceptionTest.java
	runwaysdk-client/src/test/resources/serverExceptions.properties
	runwaysdk-common/src/main/java/com/runwaysdk/InvalidArgumentException.java
	runwaysdk-common/src/main/java/com/runwaysdk/constants/RunwayProperties.java
	runwaysdk-common/src/main/java/com/runwaysdk/system/scheduler/AbstractJobDTOBase.java
	runwaysdk-common/src/main/java/com/runwaysdk/system/scheduler/AbstractJobQueryDTO.java
	runwaysdk-common/src/main/java/com/runwaysdk/system/scheduler/ExecutableJobDTOBase.java
	runwaysdk-common/src/main/java/com/runwaysdk/system/scheduler/ExecutableJobQueryDTO.java
	runwaysdk-common/src/main/java/com/runwaysdk/system/scheduler/JobHistoryDTOBase.java
	runwaysdk-common/src/main/java/com/runwaysdk/system/scheduler/JobHistoryQueryDTO.java
	runwaysdk-common/src/main/java/com/runwaysdk/transport/attributes/AttributeMultiTermDTO.java
	runwaysdk-common/src/test/java/com/runwaysdk/configuration/ProfileConfigurationTest.java
	runwaysdk-common/src/test/resources/serverExceptions.properties
	runwaysdk-server/.gitignore
	runwaysdk-server/src/main/java/com/runwaysdk/business/Mutable.java
	runwaysdk-server/src/main/java/com/runwaysdk/business/generation/GenerationFacade.java
	runwaysdk-server/src/main/java/com/runwaysdk/business/generation/SystemJavaCompiler.java
	runwaysdk-server/src/main/java/com/runwaysdk/business/generation/ontology/TermStubGenerator.java
	runwaysdk-server/src/main/java/com/runwaysdk/dataaccess/EntityDAO.java
	runwaysdk-server/src/main/java/com/runwaysdk/dataaccess/InstallerCP.java
	runwaysdk-server/src/main/java/com/runwaysdk/dataaccess/MdTermRelationshipDAOIF.java
	runwaysdk-server/src/main/java/com/runwaysdk/dataaccess/RelationshipDAO.java
	runwaysdk-server/src/main/java/com/runwaysdk/dataaccess/database/general/AbstractDatabase.java
	runwaysdk-server/src/main/java/com/runwaysdk/dataaccess/database/general/PostgreSQL.java
	runwaysdk-server/src/main/java/com/runwaysdk/dataaccess/io/XMLImporter.java
	runwaysdk-server/src/main/java/com/runwaysdk/dataaccess/metadata/MdAttributeReferenceDAO.java
	runwaysdk-server/src/main/java/com/runwaysdk/dataaccess/metadata/MdBusinessDAO.java
	runwaysdk-server/src/main/java/com/runwaysdk/dataaccess/metadata/MdControllerDAO.java
	runwaysdk-server/src/main/java/com/runwaysdk/dataaccess/metadata/MdEntityDAO.java
	runwaysdk-server/src/main/java/com/runwaysdk/facade/Facade.java
	runwaysdk-server/src/main/java/com/runwaysdk/system/metadata/MdEntityQuery.java
	runwaysdk-server/src/main/java/com/runwaysdk/system/scheduler/AbstractJobBase.java
	runwaysdk-server/src/main/java/com/runwaysdk/system/scheduler/AbstractJobQuery.java
	runwaysdk-server/src/main/java/com/runwaysdk/system/scheduler/AddJobListenerException.java
	runwaysdk-server/src/main/java/com/runwaysdk/system/scheduler/ExecutableJob.java
	runwaysdk-server/src/main/java/com/runwaysdk/system/scheduler/ExecutableJobBase.java
	runwaysdk-server/src/main/java/com/runwaysdk/system/scheduler/ExecutableJobQuery.java
	runwaysdk-server/src/main/java/com/runwaysdk/system/scheduler/ExecutionContext.java
	runwaysdk-server/src/main/java/com/runwaysdk/system/scheduler/JobHistory.java
	runwaysdk-server/src/main/java/com/runwaysdk/system/scheduler/JobHistoryBase.java
	runwaysdk-server/src/main/java/com/runwaysdk/system/scheduler/JobHistoryQuery.java
	runwaysdk-server/src/main/java/com/runwaysdk/system/scheduler/JobListenerDelegate.java
	runwaysdk-server/src/main/java/com/runwaysdk/system/scheduler/ListenerContext.java
	runwaysdk-server/src/main/java/com/runwaysdk/system/scheduler/QualifiedTypeJob.java
	runwaysdk-server/src/main/java/com/runwaysdk/system/scheduler/SchedulerManager.java
	runwaysdk-server/src/main/java/com/runwaysdk/util/ServerInitializer.java
	runwaysdk-server/src/main/java/com/runwaysdk/web/json/JSONAdapterDelegate.java
	runwaysdk-server/src/main/resources/com/runwaysdk/resources/metadata/metadata.xml
	runwaysdk-server/src/test/java/com/runwaysdk/SmokeTest.java
	runwaysdk-server/src/test/java/com/runwaysdk/configuration/CommonsConfigurationTest.java
	runwaysdk-server/src/test/resources/runwaysdk/common.properties
	runwaysdk-test/src/main/XLSFiles/test.xls
	runwaysdk-test/src/main/domain/test-schemas/schema(0001352140861497)HelloWorld.xml
	runwaysdk-test/src/main/domain/test-schemas/schema(0001352142411743)Permissions.xml
	runwaysdk-test/src/main/java/com/runwaysdk/Sandbox.java
	runwaysdk-test/src/main/java/com/runwaysdk/logging/LoggingTest.java
	runwaysdk-test/src/main/java/com/runwaysdk/system/scheduler/SchedulerTest.java
	runwaysdk-test/src/main/resources/default/common/common.properties
	runwaysdk-test/src/test/java/com/runwaysdk/UeberTestSuite_MavenTest.java
	runwaysdk-test/src/test/java/com/runwaysdk/configuration/AbstractTestConfiguration.java
merged schema changes (re-exported the metadata)
Merge remote-tracking branch 'origin/master'