gsdfgsdfg
bzcvbxc
Merge branch 'master' of https://github.com/cwade179/Foundation

Conflicts:
	db/config/target/foundation-db-config-1.0.0-SNAPSHOT.jar
	db/config/target/maven-archiver/pom.properties
	db/impex/client/bootstrap/target/foundation-impex-client-bootstrap-1.0.0-SNAPSHOT.jar
	db/impex/client/bootstrap/target/maven-archiver/pom.properties
	db/impex/client/demo/target/foundation-impex-client-demo-1.0.0-SNAPSHOT.jar
	db/impex/client/demo/target/maven-archiver/pom.properties
	db/impex/master/target/foundation-impex-master-1.0.0-SNAPSHOT.jar
	db/impex/master/target/maven-archiver/pom.properties
	db/impex/server/bootstrap/target/foundation-impex-server-bootstrap-1.0.0-SNAPSHOT.jar
	db/impex/server/bootstrap/target/maven-archiver/pom.properties
	db/impex/server/demo/target/foundation-impex-server-demo-1.0.0-SNAPSHOT.jar
	db/impex/server/demo/target/maven-archiver/pom.properties
	db/sql/target/foundation-sql-1.0.0-SNAPSHOT.jar
	db/sql/target/maven-archiver/pom.properties
	db/xml/target/foundation-xml-1.0.0-SNAPSHOT.jar
	db/xml/target/maven-archiver/pom.properties
	foundation-framework/foundation-app-framework/target/foundation-app-framework-1.0.0-SNAPSHOT.jar
	foundation-framework/foundation-app-framework/target/maven-archiver/pom.properties
	foundation-framework/foundation-development-tools/target/foundation-krad-development-tools-1.0.0-SNAPSHOT.jar
	foundation-framework/foundation-development-tools/target/maven-archiver/pom.properties
	foundation-framework/foundation-framework-data/target/maven-archiver/pom.properties
	foundation-middleware/core-service/api/target/foundation-core-service-api-1.0.0-SNAPSHOT.jar
	foundation-middleware/core-service/api/target/maven-archiver/pom.properties
	foundation-middleware/core-service/framework/target/foundation-core-service-framework-1.0.0-SNAPSHOT.jar
	foundation-middleware/core-service/framework/target/maven-archiver/pom.properties
	foundation-middleware/core-service/impl/target/foundation-core-service-impl-1.0.0-SNAPSHOT.jar
	foundation-middleware/core-service/impl/target/maven-archiver/pom.properties
	foundation-middleware/core-service/web/target/foundation-core-service-web-1.0.0-SNAPSHOT.jar
	foundation-middleware/core-service/web/target/maven-archiver/pom.properties
	foundation-middleware/core/api/target/foundation-core-api-1.0.0-SNAPSHOT.jar
	foundation-middleware/core/api/target/maven-archiver/pom.properties
	foundation-middleware/core/framework/target/foundation-core-framework-1.0.0-SNAPSHOT.jar
	foundation-middleware/core/framework/target/maven-archiver/pom.properties
	foundation-middleware/core/impl/target/foundation-core-impl-1.0.0-SNAPSHOT.jar
	foundation-middleware/core/impl/target/maven-archiver/pom.properties
	foundation-middleware/core/web/target/foundation-core-web-1.0.0-SNAPSHOT.jar
	foundation-middleware/core/web/target/maven-archiver/pom.properties
	foundation-middleware/ksb/api/target/foundation-ksb-api-1.0.0-SNAPSHOT.jar
	foundation-middleware/ksb/api/target/maven-archiver/pom.properties
	foundation-middleware/ksb/client-impl/target/foundation-ksb-client-impl-1.0.0-SNAPSHOT.jar
	foundation-middleware/ksb/client-impl/target/maven-archiver/pom.properties
	foundation-middleware/ksb/web/target/foundation-ksb-web-1.0.0-SNAPSHOT.jar
	foundation-middleware/ksb/web/target/maven-archiver/pom.properties
	foundation-middleware/standalone/.settings/org.eclipse.wst.common.component
	foundation-middleware/standalone/pom.xml