Multi language in category
modify gitignore
Merge branch 'origin/master'