Fix WAR creation
Merge branch 'refactor' of github.com:credentials/irma_web_service into refactor