setup
setup
Merge remote-tracking branch 'origin/master'

Conflicts:
	.classpath
	.settings/org.eclipse.jdt.core.prefs
	.settings/org.eclipse.wst.common.project.facet.core.xml
	WebContent/WEB-INF/web.xml