Updated the packaged war

Updated the war with the latest changes included