Changed .gitignore
Changed war
Merged with origin