Using maven assembly plugin for zipping contained war
Merge remote-tracking branch 'origin/master'