upgrade gitignore
Merge remote-tracking branch 'origin/master'
i18n add on readme.md tomcat parameter message