navigation
Merge branch 'ren'
cleaning js