Change: produce a war
Change: produce a war
Added missing files.
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml
	src/main/webapp/WEB-INF/web.xml