multi lang navigation ready
Merge branch 'origin/dobando'
JP changes