Manage war building

Conflicts:
	pom.xml