Merge branch 'develop-2.0.x' of githubproxy:dlecan/play2-war-plugin into develop-2.0.x
Merge branch 'develop-2.0.x' of github.com:dlecan/play2-war-plugin into develop-2.0.x