Make WAR, not JAR
Merge branch 'master' of
git@github.com:robertkuhar/gradle-quickstart.git

Conflicts:
	build.gradle