nav.js changed
Merge branch 'jackie'
Merge branch 'jackie'
Merge branch 'jackie'
[Jackie] readme update: misclleneous issues fix