updated .gitignore for /META-INF/context.xml
Merge .gitignore conflict