deleted:    .project
	deleted:    .settings/org.eclipse.m2e.core.prefs
	deleted:    .settings/org.eclipse.wst.common.component
Merge branch 'master' of github.com:valefor/J2EE

Conflicts:
	sae/webapps/alcapphello/.project
	sae/webapps/alcapphello/.settings/org.eclipse.m2e.core.prefs
	sae/webapps/alcapphello/.settings/org.eclipse.wst.common.component

	modified:   .classpath
	new file:   .project
	modified:   .settings/org.eclipse.jdt.core.prefs
	new file:   .settings/org.eclipse.m2e.core.prefs
	new file:   .settings/org.eclipse.wst.common.component
	new file:   design/database/forum.cdb
	new file:   design/database/forum.cdm
	new file:   design/database/forum_PDM.pdb
	new file:   design/database/forum_PDM.pdm
	new file:   pom.xml
Merge branch 'master' of github.com:valefor/J2EE
	new file:   sae/webapps/alcapphello/WebContent/WEB-INF/applicationContext-security.xml
	new file:   sae/webapps/alcapphello/WebContent/WEB-INF/applicationContext.xml
	modified:   sae/webapps/alcapphello/WebContent/WEB-INF/web.xml
	modified:   sae/webapps/alcapphello/WebContent/WEB-INF/zk-label_en.properties
	modified:   sae/webapps/alcapphello/WebContent/WEB-INF/zk-label_zh_CN.properties
	modified:   sae/webapps/alcapphello/WebContent/registration.zul
	new file:   sae/webapps/alcapphello/WebContent/styles/default.css
	modified:   sae/webapps/alcapphello/pom.xml
	new file:   sae/webapps/alcapphello/target/alcapphello-0.0.1-SNAPSHOT/META-INF/MANIFEST.MF
	new file:   sae/webapps/alcapphello/target/alcapphello-0.0.1-SNAPSHOT/WEB-INF/applicationContext.xml
	new file:   sae/webapps/alcapphello/target/alcapphello-0.0.1-SNAPSHOT/WEB-INF/web.xml
	new file:   sae/webapps/alcapphello/target/alcapphello-0.0.1-SNAPSHOT/WEB-INF/zk-label_en.properties
	new file:   sae/webapps/alcapphello/target/alcapphello-0.0.1-SNAPSHOT/WEB-INF/zk-label_zh_CN.properties
	new file:   sae/webapps/alcapphello/target/alcapphello-0.0.1-SNAPSHOT/WEB-INF/zk.xml
	new file:   sae/webapps/alcapphello/target/alcapphello-0.0.1-SNAPSHOT/images/Add.png
	new file:   sae/webapps/alcapphello/target/alcapphello-0.0.1-SNAPSHOT/images/Alert.png
	new file:   sae/webapps/alcapphello/target/alcapphello-0.0.1-SNAPSHOT/images/Allow.png
	new file:   sae/webapps/alcapphello/target/alcapphello-0.0.1-SNAPSHOT/images/Deny.png
	new file:   sae/webapps/alcapphello/target/alcapphello-0.0.1-SNAPSHOT/images/Error.png
	new file:   sae/webapps/alcapphello/target/alcapphello-0.0.1-SNAPSHOT/images/Remove.png
	new file:   sae/webapps/alcapphello/target/alcapphello-0.0.1-SNAPSHOT/images/female.png
	new file:   sae/webapps/alcapphello/target/alcapphello-0.0.1-SNAPSHOT/images/form.png
	new file:   sae/webapps/alcapphello/target/alcapphello-0.0.1-SNAPSHOT/images/male.png
	new file:   sae/webapps/alcapphello/target/alcapphello-0.0.1-SNAPSHOT/index.zul
	new file:   sae/webapps/alcapphello/target/alcapphello-0.0.1-SNAPSHOT/registration.zul
	new file:   sae/webapps/alcapphello/target/alcapphello-0.0.1-SNAPSHOT/styles/default.css
	new file:   sae/webapps/alcapphello/target/alcapphello-0.0.1-SNAPSHOT/timeout.zul
	new file:   sae/webapps/alcapphello/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
	new file:   sae/webapps/alcapphello/target/m2e-wtp/web-resources/META-INF/maven/org.alc/alcapphello/pom.properties
	new file:   sae/webapps/alcapphello/target/m2e-wtp/web-resources/META-INF/maven/org.alc/alcapphello/pom.xml
	new file:   sae/webapps/alcapphello/target/maven-archiver/pom.properties
	new file:   sae/webapps/alcapphello/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
	new file:   sae/webapps/alcapphello/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
	deleted:    sae/webapps/alcapphello/target/alcapphello-0.0.1-SNAPSHOT/META-INF/MANIFEST.MF
	deleted:    sae/webapps/alcapphello/target/alcapphello-0.0.1-SNAPSHOT/WEB-INF/applicationContext.xml
	deleted:    sae/webapps/alcapphello/target/alcapphello-0.0.1-SNAPSHOT/WEB-INF/web.xml
	deleted:    sae/webapps/alcapphello/target/alcapphello-0.0.1-SNAPSHOT/WEB-INF/zk-label_en.properties
	deleted:    sae/webapps/alcapphello/target/alcapphello-0.0.1-SNAPSHOT/WEB-INF/zk-label_zh_CN.properties
	deleted:    sae/webapps/alcapphello/target/alcapphello-0.0.1-SNAPSHOT/WEB-INF/zk.xml
	deleted:    sae/webapps/alcapphello/target/alcapphello-0.0.1-SNAPSHOT/images/Add.png
	deleted:    sae/webapps/alcapphello/target/alcapphello-0.0.1-SNAPSHOT/images/Alert.png
	deleted:    sae/webapps/alcapphello/target/alcapphello-0.0.1-SNAPSHOT/images/Allow.png
	deleted:    sae/webapps/alcapphello/target/alcapphello-0.0.1-SNAPSHOT/images/Deny.png
	deleted:    sae/webapps/alcapphello/target/alcapphello-0.0.1-SNAPSHOT/images/Error.png
	deleted:    sae/webapps/alcapphello/target/alcapphello-0.0.1-SNAPSHOT/images/Remove.png
	deleted:    sae/webapps/alcapphello/target/alcapphello-0.0.1-SNAPSHOT/images/female.png
	deleted:    sae/webapps/alcapphello/target/alcapphello-0.0.1-SNAPSHOT/images/form.png
	deleted:    sae/webapps/alcapphello/target/alcapphello-0.0.1-SNAPSHOT/images/male.png
	deleted:    sae/webapps/alcapphello/target/alcapphello-0.0.1-SNAPSHOT/index.zul
	deleted:    sae/webapps/alcapphello/target/alcapphello-0.0.1-SNAPSHOT/registration.zul
	deleted:    sae/webapps/alcapphello/target/alcapphello-0.0.1-SNAPSHOT/styles/default.css
	deleted:    sae/webapps/alcapphello/target/alcapphello-0.0.1-SNAPSHOT/timeout.zul
	deleted:    sae/webapps/alcapphello/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
	deleted:    sae/webapps/alcapphello/target/m2e-wtp/web-resources/META-INF/maven/org.alc/alcapphello/pom.properties
	deleted:    sae/webapps/alcapphello/target/m2e-wtp/web-resources/META-INF/maven/org.alc/alcapphello/pom.xml
	deleted:    sae/webapps/alcapphello/target/maven-archiver/pom.properties
	deleted:    sae/webapps/alcapphello/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
	deleted:    sae/webapps/alcapphello/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst