build war file & include in distribution archive
Merge remote-tracking branch 'upstream/master'