merge
Merge branch 'dev' of https://github.com/shefun/www.navi.cc into dev