Revert packagn to jar from war.
Merge remote-tracking branch 'origin/master'