test merge issues
Merge branch 'Window' of https://github.com/patricerosay/ExtractTransformLoadEclipse into Window

Conflicts:
	com.pro.etl.persistence.model.gemini/.classpath
	com.pro.etl.persistence.model.gemini/.project

com.pro.etl.persistence.model.gemini/.settings/org.eclipse.jdt.core.pref
s
	com.pro.etl.persistence.model.gemini/META-INF/persistence.xml
	com.pro.etl.persistence.model.gemini/build.properties
	com.pro.etl.persistence.model.gemini/pom.xml

com.pro.etl.persistence.model.gemini/src/main/java/com/pro/etl/persisten
ce/model/ActivityData.java
	com.pro.etl.persistence.model.gemini/target/.gitignore
	org.eclipse.gemini.jpa/.project