Merge pull request #2 from pi-engine/master

Update from main repo
Merge pull request #3 from pi-engine/master

update from main repo
Improve local support
Merge pull request #45 from voltan/master

Improve localization
nav-data bug,as a php tag with no php end
Merge pull request #48 from sexnothing/master

nav edit bug
Merge pull request #5 from pi-engine/master

Merge pull request #5 from pi-engine/master