fixed the double admin navigation problem. Fixed the missing string key notices.
Merge branch '2.x-2.x-dev'